diff options
| author | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-10-18 02:14:43 +0000 |
|---|---|---|
| committer | russell <russell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-10-18 02:14:43 +0000 |
| commit | f7aed9c474cca7bc7264dff4dab804548f9d7caf (patch) | |
| tree | 2feb3ee4b32a8f898ddef1afe890ca03093d60cb /Makefile | |
| parent | a5955737458d142b9e8e83a9a799363fb5bf5a50 (diff) | |
remove ROOT_PREFIX, and move INSTALL_PREFIX to before the first time it is used
(issue #7913, darren1713)
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@1517 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
@@ -9,6 +9,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 KVERS:=$(shell uname -r) @@ -47,9 +49,6 @@ CFLAGS+=-DSTANDALONE_ZAPATA 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 @@ DYNFS:=$(shell ps ax | grep -v grep | grep -q devfsd && echo "yes") 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 @@ endif 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 |