From a1a74f9070a79e6d276a78bc5899058a9ea801d4 Mon Sep 17 00:00:00 2001 From: Simon Eisenmann Date: Tue, 3 Feb 2015 11:34:22 +0100 Subject: [PATCH] Do not use prefix for config location fixing #161 --- Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 658575d3..a44cb2b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,15 +27,14 @@ CONFIG_FILE ?= spreed-webrtc-server.conf CONFIG_PATH ?= /etc GOBUILDFLAGS ?= GOTESTFLAGS ?= -DESTDIR ?= / + +BIN ?= @prefix@/sbin +SHARE ?= @prefix@/share/spreed-webrtc-server +CONFIG_DIR ?= $(CONFIG_PATH) OUTPUT := $(CURDIR)/bin OUTPUT_JS := $(CURDIR)/build/out -BIN := $(DESTDIR)@prefix@/sbin -CONFIG_DIR := $(DESTDIR)@prefix@$(CONFIG_PATH) -SHARE := $(DESTDIR)@prefix@/share/spreed-webrtc-server - BUILD_ARCH := $(shell $(GO) env GOARCH) BUILD_OS := $(shell go env GOOS) DIST := $(CURDIR)/dist_$(BUILD_ARCH) @@ -119,8 +118,9 @@ release: OUTPUT = $(DIST_BIN) release: $(DIST_BIN) binary releaseassets install: - echo $(BIN) - echo $(SHARE) + @echo "Installing binaries to: $(BIN)" + @echo "Installing static resources to: $(SHARE)" + @echo "Installing config file to: $(CONFIG_DIR)" $(INSTALL) -d $(BIN) $(CONFIG_DIR) $(INSTALL) -d $(SHARE)/www/html $(INSTALL) -d $(SHARE)/www/static