diff options
| author | Jason Parker <jparker@digium.com> | 2008-09-11 15:45:04 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2008-09-11 15:45:04 +0000 |
| commit | 89046d0a6bb4857eb779da7e3ee6f787462ac8f3 (patch) | |
| tree | 4455121971e4ed4e3c6cc9fdb1afafec16c8a9d4 /Makefile | |
| parent | 030adf23abcc8e6f3f28862b01f5e461cecc05d4 (diff) | |
Fix installation of ifup-hdlc and init script when using DESTDIR.
(Step 2 of cleanup)
(closes issue #13430)
Reported by: jcollie
Patches:
0001-Fix-install-of-ifup-hdlc-when-installing-into-an-alt.patch uploaded by jcollie (license 412)
Tested by: qwell
Note: Patch from #13430 was extended to modify init script installation as well.
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4893 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -61,9 +61,9 @@ ifeq (,$(DESTDIR)) endif endif -INITRD_DIR := $(firstword $(wildcard /etc/rc.d/init.d /etc/init.d)) +INITRD_DIR := $(firstword $(wildcard $(DESTDIR)/etc/rc.d/init.d $(DESTDIR)/etc/init.d)) ifneq (,$(INITRD_DIR)) - INIT_TARGET := $(DESTDIR)$(INITRD_DIR)/dahdi + INIT_TARGET := $(INITRD_DIR)/dahdi COPY_INITD := install -D dahdi.init $(INIT_TARGET) endif @@ -72,9 +72,9 @@ MODULES_FILE = /etc/dahdi/modules MODPROBE_FILE = /etc/modprobe.d/dahdi BLACKLIST_FILE = /etc/modprobe.d/dahdi.blacklist -NETSCR_DIR := $(firstword $(wildcard /etc/sysconfig/network-scripts )) +NETSCR_DIR := $(firstword $(wildcard $(DESTDIR)/etc/sysconfig/network-scripts )) ifneq (,$(NETSCR_DIR)) - NETSCR_TARGET := $(DESTDIR)$(NETSCR_DIR)/ifup-hdlc + NETSCR_TARGET := $(NETSCR_DIR)/ifup-hdlc COPY_NETSCR := install -D ifup-hdlc $(NETSCR_TARGET) endif |