Browse Source

Fixed a binary variables to work correctly together.

pull/156/head
Simon Eisenmann 11 years ago
parent
commit
cf0b35b414
  1. 5
      Makefile.am

5
Makefile.am

@ -62,7 +62,7 @@ endif
getupdate: vendorclean get getupdate: vendorclean get
binary: get binary: get
$(GO) build $(GOBUILDFLAGS) -o $(OUTPUT)/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME) $(GO) build $(GOBUILDFLAGS) -o bin/$(EXENAME) -ldflags '$(LDFLAGS)' app/$(EXENAME)
binaryrace: GOBUILDFLAGS := $(GOBUILDFLAGS) -race binaryrace: GOBUILDFLAGS := $(GOBUILDFLAGS) -race
binaryrace: binary binaryrace: binary
@ -130,7 +130,7 @@ install:
$(INSTALL) -d $(SHARE)/www/static/translation $(INSTALL) -d $(SHARE)/www/static/translation
$(INSTALL) -d $(SHARE)/www/static/css $(INSTALL) -d $(SHARE)/www/static/css
$(INSTALL) -d $(SHARE)/www/static/js/libs/pdf $(INSTALL) -d $(SHARE)/www/static/js/libs/pdf
$(INSTALL) $(DIST_BIN)/* $(BIN) $(INSTALL) bin/$(EXENAME) $(BIN)
$(INSTALL) -m 644 server.conf.in $(CONFIG_DIR)/$(CONFIG_FILE) $(INSTALL) -m 644 server.conf.in $(CONFIG_DIR)/$(CONFIG_FILE)
$(INSTALL) html/* $(SHARE)/www/html $(INSTALL) html/* $(SHARE)/www/html
$(INSTALL) static/img/* $(SHARE)/www/static/img $(INSTALL) static/img/* $(SHARE)/www/static/img
@ -147,6 +147,7 @@ clean:
$(GO) clean -i -r app/... 2>/dev/null || true $(GO) clean -i -r app/... 2>/dev/null || true
rm -rf $(CURDIR)/static/fonts rm -rf $(CURDIR)/static/fonts
rm -rf $(CURDIR)/build/out rm -rf $(CURDIR)/build/out
rm -f $(CURDIR)/bin/$(EXENAME)
distclean: clean distclean: clean
rm -rf $(DIST) rm -rf $(DIST)

Loading…
Cancel
Save