From 2db7087041448f8653ddb30e9ef7ced3f7e5f119 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Mon, 21 Jan 2013 13:15:06 +0900 Subject: [PATCH] Add support multiarch Signed-off-by: Nobuhiro Iwamatsu --- debian/control | 4 ++++ debian/libnfc-dev.install | 8 ++++---- debian/libnfc4.install | 2 +- debian/rules | 10 ++++++++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/control b/debian/control index 12c7c03..021a59f 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,8 @@ Vcs-Browser: http://code.google.com/p/libnfc/source/browse/ Package: libnfc4 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libusb-0.1-4 Description: Near Field Communication (NFC) library libnfc is a Free Software library for Near Field Communication. @@ -19,6 +21,8 @@ Description: Near Field Communication (NFC) library Package: libnfc-dev Section: libdevel Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libnfc4 (= ${binary:Version}), libusb-dev Description: Near Field Communication library (development files) libnfc is a free software library for near-field communication. diff --git a/debian/libnfc-dev.install b/debian/libnfc-dev.install index 4bedc33..37c000b 100644 --- a/debian/libnfc-dev.install +++ b/debian/libnfc-dev.install @@ -1,5 +1,5 @@ debian/tmp/usr/include/nfc -debian/tmp/usr/lib/libnfc.a -debian/tmp/usr/lib/libnfc.la -debian/tmp/usr/lib/libnfc.so -debian/tmp/usr/lib/pkgconfig/libnfc.pc +debian/tmp/usr/lib/*/libnfc.a +debian/tmp/usr/lib/*/libnfc.la +debian/tmp/usr/lib/*/libnfc.so +debian/tmp/usr/lib/*/pkgconfig/libnfc.pc diff --git a/debian/libnfc4.install b/debian/libnfc4.install index 08cb976..c24c869 100644 --- a/debian/libnfc4.install +++ b/debian/libnfc4.install @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libnfc.so.* +debian/tmp/usr/lib/*/libnfc.so.* contrib/udev/42-pn53x.rules lib/udev/rules.d/ diff --git a/debian/rules b/debian/rules index 2bc72d9..fbdd8f3 100755 --- a/debian/rules +++ b/debian/rules @@ -12,12 +12,18 @@ # "nocheck" option prevents from running tests (which need dedicated hardware) export DEB_BUILD_OPTIONS=nocheck +# --enable-debug --with-drivers=all +confflags := --disable-silent-rules \ + --prefix=/usr \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ + $(NULL) +confflags += $(shell dpkg-buildflags --export=configure) + override_dh_installchangelogs: dh_installchangelogs ChangeLog override_dh_auto_configure: - dh_auto_configure -- --disable-silent-rules - # --enable-debug --with-drivers=all + dh_auto_configure -- $(confflags) %: dh $@ --with autoreconf