[zaptel-commits] russell: branch 1.2 r1517 - /branches/1.2/Makefile

[zaptel-commits at lists.digium.com]

Author: russell
Date: Tue Oct 17 21:14:43 2006
New Revision: 1517

URL: http://svn.digium.com/view/zaptel?rev=1517&view=rev
Log:
remove ROOT_PREFIX, and move INSTALL_PREFIX to before the first time it is used
(issue #7913, darren1713)

Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?rev=1517&r1=1516&r2=1517&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Tue Oct 17 21:14:43 2006
@@ -8,6 +8,8 @@
 
 HOSTCC=gcc
 PWD:=$(shell pwd)
+
+INSTALL_PREFIX:=$(DESTDIR)
 
 # If you want to build for a kernel other than the current kernel, set KVERS
 ifndef KVERS
@@ -47,9 +49,6 @@
 KMAKE:= $(MAKE) -C $(KSRC) SUBDIRS=$(PWD)
 KMAKE_INST:= $(KMAKE) INSTALL_MOD_PATH=$(INSTALL_PREFIX) INSTALL_MOD_DIR=misc modules_install
 
-ROOT_PREFIX=
-INSTALL_PREFIX:=$(DESTDIR)
-
 CONFIG_FILE:=$(INSTALL_PREFIX)/etc/zaptel.conf
 CFLAGS+=-DZAPTEL_CONFIG=\"$(CONFIG_FILE)\"
 
@@ -65,7 +64,7 @@
 endif
 
 ifeq ($(BUILDVER),linux26)
-  ifneq (,$(wildcard $(ROOT_PREFIX)/etc/udev/rules.d))
+  ifneq (,$(wildcard $(INSTALL_PREFIX)/etc/udev/rules.d))
     DYNFS=yes
     UDEVRULES=yes
   endif
@@ -352,7 +351,7 @@
 	install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
 	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
 	[ -f $(CONFIG_FILE) ] || install -D -m 644 zaptel.conf.sample $(CONFIG_FILE)
-	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel,$(MODULES))"
+	build_tools/genmodconf $(BUILDVER) "$(INSTALL_PREFIX)" "$(filter-out zaptel,$(MODULES))"
 	@if [ -d /etc/modutils ]; then \
 		/sbin/update-modules ; \
 	fi