[SCM] jackd2/master: Convert debian/rules install targets to multiarch

adiknoth-guest at users.alioth.debian.org adiknoth-guest at users.alioth.debian.org
Mon Apr 30 12:57:02 UTC 2012


The following commit has been merged in the master branch:
commit 4a3238c0999acdff34ad142cfd5ff6357ea4ca5c
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Apr 30 14:41:11 2012 +0200

    Convert debian/rules install targets to multiarch

diff --git a/debian/rules b/debian/rules
index e3f5ec5..c2c2df6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,9 +81,9 @@ install/jackd2::
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	dh_install -pjackd2 debian/tmp/usr/bin/alsa_in
 	dh_install -pjackd2 debian/tmp/usr/bin/alsa_out
-	dh_install -pjackd2 debian/tmp/usr/lib/jack/jack_alsa.so
-	dh_install -pjackd2 debian/tmp/usr/lib/jack/jack_alsarawmidi.so
-	dh_install -pjackd2 debian/tmp/usr/lib/jack/audioadapter.so
+	dh_install -pjackd2 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/jack/jack_alsa.so
+	dh_install -pjackd2 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/jack/jack_alsarawmidi.so
+	dh_install -pjackd2 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/jack/audioadapter.so
 endif	
 
 binary-install/jackd2::
@@ -97,8 +97,8 @@ binary-post-install/libjack0::
 		--override s/libcelt0-0-dev/libcelt-dev/ \
 		--override s/libstdc++6-4.1-dev// \
 		debian/libjack-dev.substvars \
-		debian/tmp/usr/lib/*.so \
-		debian/tmp/usr/lib/jack/*.so
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.so \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/jack/*.so
 
 #common-binary-post-install-arch::
 #        ln -s jackdmp debian/jackdmp/usr/bin/jackd

-- 
jackd2 packaging



More information about the pkg-multimedia-commits mailing list