From b783155a77230cdd8604bcf3464387608f02bab1 Mon Sep 17 00:00:00 2001 From: Lance Cooper Date: Mon, 7 Jul 2014 19:02:01 -0500 Subject: [PATCH] Correct config install path variable names in Makefile. --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index b99180b5..ae7a5c48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,7 +124,7 @@ releasetest: dist_gopath test install: echo $(BIN) echo $(SHARE) - $(INSTALL) -d $(BIN) $(CONF) + $(INSTALL) -d $(BIN) $(CONFIG_DIR) $(INSTALL) -d $(SHARE)/www/html $(INSTALL) -d $(SHARE)/www/static $(INSTALL) -d $(SHARE)/www/static/img @@ -133,7 +133,7 @@ install: $(INSTALL) -d $(SHARE)/www/static/translation $(INSTALL) -d $(SHARE)/www/static/css $(INSTALL) $(DIST_BIN)/* $(BIN) - $(INSTALL) -m 644 server.conf.in $(CONF)/$(CONFIG_FILE) + $(INSTALL) -m 644 server.conf.in $(CONFIG_DIR)/$(CONFIG_FILE) $(INSTALL) html/* $(SHARE)/www/html $(INSTALL) static/img/* $(SHARE)/www/static/img $(INSTALL) static/sounds/* $(SHARE)/www/static/sounds @@ -168,8 +168,8 @@ dist_gopath: $(DIST_SRC) tarball: TARPATH = $(DIST)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) tarball: BIN = $(TARPATH)/loader -tarball: CONF = $(TARPATH)/loader -tarball: DOCS = $(CONF)/docs +tarball: CONFIG_DIR = $(TARPATH)/loader +tarball: DOCS = $(CONFIG_DIR)/docs tarball: SHARE = $(TARPATH)/ tarball: distclean release install echo -n $(PACKAGE_VERSION) > $(TARPATH)/version.txt