diff --git a/debian/liblz-dev.install b/debian/liblz-dev.install old mode 100644 new mode 100755 index 3873b2b..a82be7b --- a/debian/liblz-dev.install +++ b/debian/liblz-dev.install @@ -1,4 +1,12 @@ +#!/bin/sh + +set -e + +DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" + +cat << EOF usr/include -usr/lib/i386-linux-gnu/*.a -usr/lib/i386-linux-gnu/*.so +usr/lib/${DEB_HOST_MULTIARCH}/*.a +usr/lib/${DEB_HOST_MULTIARCH}/*.so usr/share/info +EOF diff --git a/debian/liblz-dev.install.in b/debian/liblz-dev.install.in deleted file mode 100644 index f7bb199..0000000 --- a/debian/liblz-dev.install.in +++ /dev/null @@ -1,4 +0,0 @@ -usr/include -usr/lib/@DEB_HOST_MULTIARCH@/*.a -usr/lib/@DEB_HOST_MULTIARCH@/*.so -usr/share/info diff --git a/debian/liblz1.install b/debian/liblz1.install old mode 100644 new mode 100755 index 2b7a24e..68a9cf4 --- a/debian/liblz1.install +++ b/debian/liblz1.install @@ -1 +1,9 @@ -usr/lib/i386-linux-gnu/*.so.* +#!/bin/sh + +set -e + +DEB_HOST_MULTIARCH="$(dpkg-architecture -qDEB_HOST_MULTIARCH)" + +cat << EOF +usr/lib/${DEB_HOST_MULTIARCH}/*.so.* +EOF diff --git a/debian/liblz1.install.in b/debian/liblz1.install.in deleted file mode 100644 index 8d0a62e..0000000 --- a/debian/liblz1.install.in +++ /dev/null @@ -1 +0,0 @@ -usr/lib/@DEB_HOST_MULTIARCH@/*.so.* diff --git a/debian/rules b/debian/rules index dc49cb5..8451ed8 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,12 @@ #!/usr/bin/make -f -SHELL := sh -e - DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh ${@} -override_dh_auto_clean: - dh_auto_clean - - for _FILE in debian/*.install.in; \ - do \ - rm -f debian/$$(basename $${_FILE} .in); \ - sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \ - $${_FILE} > debian/$$(basename $${_FILE} .in); \ - done - override_dh_auto_configure: - dh_auto_configure -- --enable-shared --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + dh_auto_configure -- --enable-shared --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) CFLAGS="$(CFLAGS CPPFLAGS)" LDFLAGS="$(LDFLAGS)" override_dh_auto_install: dh_auto_install -- LDCONFIG=/bin/true