[zaptel-commits] qwell: branch 1.4 r3067 - /branches/1.4/Makefile

[SVN commits to the Zaptel project]

Author: qwell
Date: Thu Sep 20 13:42:35 2007
New Revision: 3067

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3067
Log:
Remove DESTDIR from CONFIG_FILE, since we don't want DESTDIR passed in as part of the -DZAPTEL_CONFIG.

Closes issue #10764, pointed out by cabal95

Modified:
    branches/1.4/Makefile

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=3067&r1=3066&r2=3067
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Thu Sep 20 13:42:35 2007
@@ -179,7 +179,7 @@
 
 ROOT_PREFIX=
 
-CONFIG_FILE=$(DESTDIR)/etc/zaptel.conf
+CONFIG_FILE=/etc/zaptel.conf
 CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
 
 # sample makefile "trace print"
@@ -455,8 +455,8 @@
 	install  $(BINS) $(DESTDIR)$(BIN_DIR)/
 	install -d $(DESTDIR)$(MAN_DIR)
 	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
-ifeq (,$(wildcard $(CONFIG_FILE)))
-	$(INSTALL) -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
+ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
+	$(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
 endif
 
 # Pushing those two to a separate target that is not used by default: