[svn-commits] qwell: tools/trunk r4893 - /tools/trunk/Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Thu Sep 11 10:45:04 2008
New Revision: 4893

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4893
Log:
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.

Modified:
    tools/trunk/Makefile

Modified: tools/trunk/Makefile
URL: http://svn.digium.com/view/dahdi/tools/trunk/Makefile?view=diff&rev=4893&r1=4892&r2=4893
==============================================================================
--- tools/trunk/Makefile (original)
+++ tools/trunk/Makefile Thu Sep 11 10:45:04 2008
@@ -61,9 +61,9 @@
   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 @@
 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