From 89046d0a6bb4857eb779da7e3ee6f787462ac8f3 Mon Sep 17 00:00:00 2001 From: Jason Parker Date: Thu, 11 Sep 2008 15:45:04 +0000 Subject: 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 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3faf752..4a943ba 100644 --- a/Makefile +++ b/Makefile @@ -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 -- cgit v1.2.3