From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 17 Mar 2012 17:42:40 +0000 (+0100)
Subject: isdn4k-utils: Make package work on x86_64.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cb374c5a3373d460435ddb2a462498b39f7abef;p=ipfire-3.x.git

isdn4k-utils: Make package work on x86_64.
---

diff --git a/isdn4k-utils/isdn4k-utils.nm b/isdn4k-utils/isdn4k-utils.nm
index ad636c18f..38149ed1c 100644
--- a/isdn4k-utils/isdn4k-utils.nm
+++ b/isdn4k-utils/isdn4k-utils.nm
@@ -6,7 +6,7 @@
 name       = isdn4k-utils
 version    = 3.2
 devel_ver  = CVS-2010-05-01
-release    = 5
+release    = 6
 thisapp    = %{name}-%{devel_ver}-patched
 
 groups     = Networking/Tools
@@ -61,7 +61,7 @@ build
 		echo "CONFIG_FAQ=y" >> .config
 		echo "CONFIG_FAQDIR='/usr/share/doc/isdn4k-utils'" >> .config
 		echo "CONFIG_DATADIR='/usr/share/isdn'" >> .config
-		echo "LIBDIR='/usr/lib'" >> .config
+		echo "LIBDIR='%{libdir}'" >> .config
 		echo "CONFIG_FIRMWAREDIR='/usr/share/isdn'" >> .config
 		echo "CONFIG_CARD_SBINDIR='/sbin'" >> .config
 		sed -e "s,',,g" .config > .config.h
@@ -75,11 +75,11 @@ build
 
 	install
 		mkdir -pv %{BUILDROOT}/usr/sbin
-		make install CFLAGS="%{CFLAGS}" DESTDIR="%{BUILDROOT}"
+		make install CFLAGS="%{CFLAGS}" LIBDIR="%{libdir}" DESTDIR="%{BUILDROOT}"
 
 		# Install udev rules for isdn.
-		mkdir -pv %{BUILDROOT}/lib/udev/rules.d/
-		install -m 644 %{DIR_SOURCE}/40-isdn.rules %{BUILDROOT}/lib/udev/rules.d/
+		mkdir -pv %{BUILDROOT}/%{lib}/udev/rules.d/
+		install -m 644 %{DIR_SOURCE}/40-isdn.rules %{BUILDROOT}/%{lib}/udev/rules.d/
 
 		# Install config files for capi.
 		mkdir -pv %{BUILDROOT}/etc
diff --git a/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch b/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch
new file mode 100644
index 000000000..133345bed
--- /dev/null
+++ b/isdn4k-utils/patches/isdn4k-utils-pppcapiplugin-libdir.patch
@@ -0,0 +1,9 @@
+diff -Nur a/pppdcapiplugin/Makefile.template b/pppdcapiplugin/Makefile.template
+--- a/pppdcapiplugin/Makefile.template	2001-05-01 14:43:49.000000000 +0200
++++ b/pppdcapiplugin/Makefile.template	2012-03-17 18:36:00.035594144 +0100
+@@ -8,7 +8,7 @@
+ #  as published by the Free Software Foundation; either version
+ #  2 of the License, or (at your option) any later version.
+ 
+-PLUGINDIR=${DESTDIR}/usr/lib/pppd/$(PPPVERSION)
++PLUGINDIR=${DESTDIR}${LIBDIR}/pppd/$(PPPVERSION)