[Astlinux-commits] SF.net SVN: astlinux:[5836] branches/1.0/package

[<abe...@us...>]

Revision: 5836
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5836&view=rev
Author:   abelbeck
Date:     2012-12-24 22:38:55 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
dahdi-linux and dahdi-tools, set PERLLIBDIR to a known target location, not based on the host as before

Modified Paths:
--------------
    branches/1.0/package/dahdi-linux/dahdi-linux.mk
    branches/1.0/package/dahdi-tools/dahdi-tools.mk

Modified: branches/1.0/package/dahdi-linux/dahdi-linux.mk
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-12-24 21:44:09 UTC (rev 5835)
+++ branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-12-24 22:38:55 UTC (rev 5836)
@@ -18,7 +18,7 @@
 DAHDI_LINUX_DRIVERS_DIR := $(DAHDI_LINUX_DIR)/drivers/dahdi
 DAHDI_LINUX_BINARY := dahdi.ko
 DAHDI_LINUX_TARGET_BINARY := etc/udev/rules.d/dahdi.rules
-PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
+PERLLIBDIR := /usr/local/share/perl
 DAHDI_LINUX_PREREQS := linux libusb udev
 DAHDI_LINUX_CONFIGURE_ARGS :=
 DEPMOD := $(HOST_DIR)/usr/sbin/depmod
@@ -60,14 +60,14 @@
 		install-include
 
 $(TARGET_DIR)/$(DAHDI_LINUX_TARGET_BINARY): $(DAHDI_LINUX_DRIVERS_DIR)/$(DAHDI_LINUX_BINARY)
-	mkdir -p $(TARGET_DIR)/$(PERLLIBDIR)
+	mkdir -p $(TARGET_DIR)$(PERLLIBDIR)
 	$(MAKE1) -C $(DAHDI_LINUX_DIR) \
 		HOSTCC=gcc CC=$(TARGET_CC) ARCH=$(KERNEL_ARCH) \
 		DESTDIR=$(TARGET_DIR) KVERS=$(LINUX_VERSION_PROBED) \
 		KSRC=$(LINUX_DIR) PWD=$(DAHDI_LINUX_DIR) \
+		PERLLIBDIR=$(PERLLIBDIR) \
 		install
 	rm -rf $(TARGET_DIR)/usr/include
-	rm -rf $(TARGET_DIR)/$(PERLLIBDIR)
 	$(DEPMOD) -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
 
 dahdi-linux: $(TARGET_DIR)/$(DAHDI_LINUX_TARGET_BINARY) \

Modified: branches/1.0/package/dahdi-tools/dahdi-tools.mk
===================================================================
--- branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-12-24 21:44:09 UTC (rev 5835)
+++ branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-12-24 22:38:55 UTC (rev 5836)
@@ -17,7 +17,7 @@
 DAHDI_TOOLS_DIR := $(BUILD_DIR)/dahdi-tools-$(DAHDI_TOOLS_VERSION)
 DAHDI_TOOLS_BINARY := dahdi_cfg
 DAHDI_TOOLS_TARGET_BINARY := usr/sbin/dahdi_cfg
-PERLLIBDIR := $(shell eval `perl -V:sitelib`; echo "$$sitelib")
+PERLLIBDIR := /usr/local/share/perl
 DAHDI_TOOLS_PREREQS := libusb newt dahdi-linux
 DAHDI_TOOLS_CONFIGURE_ARGS :=
 
@@ -60,10 +60,10 @@
 	$(MAKE) -C $(DAHDI_TOOLS_DIR) HOSTCC=gcc CC=$(TARGET_CC)
 
 $(TARGET_DIR)/$(DAHDI_TOOLS_TARGET_BINARY): $(DAHDI_TOOLS_DIR)/$(DAHDI_TOOLS_BINARY)
-	mkdir -p $(TARGET_DIR)/$(PERLLIBDIR)
+	mkdir -p $(TARGET_DIR)$(PERLLIBDIR)
 	rm -rf $(TARGET_DIR)/etc/dahdi
 	$(MAKE1) -C $(DAHDI_TOOLS_DIR) HOSTCC=gcc CC=$(TARGET_CC) \
-		PERLLIBDIR=/usr/local/share/perl \
+		PERLLIBDIR=$(PERLLIBDIR) \
 		install DESTDIR=$(TARGET_DIR)
 	@rm -rf $(TARGET_DIR)/stat/etc/dahdi
 	mv $(TARGET_DIR)/etc/dahdi $(TARGET_DIR)/stat/etc/dahdi

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.