From 6ade69c00ef15e4fdebc8bd23bb73bdd66e4d78c Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Mon, 23 Sep 2013 16:21:06 +0200 Subject: no multiarch when install for udeb multiarch is not used in udebs, so there is no need to do the udeb installation using a multiarch library directory to move them back later --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 25e9a698..c3c57a75 100755 --- a/debian/rules +++ b/debian/rules @@ -56,7 +56,7 @@ override_dh_auto_clean: override_dh_auto_install: dh_auto_install -Bbuild-deb --destdir= -- prefix=$(DEB_DESTDIR) libdir=$(DEB_DESTDIR)/lib/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb - dh_auto_install -Bbuild-udeb --destdir= -- prefix=$(DEB_DESTDIR_UDEB) libdir=$(DEB_DESTDIR_UDEB)/lib/$(DEB_HOST_MULTIARCH) sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb + dh_auto_install -Bbuild-udeb --destdir= -- prefix=$(DEB_DESTDIR_UDEB) libdir=$(DEB_DESTDIR_UDEB)/lib sysconfdir=$(DEB_DESTDIR_UDEB)/etc localstatedir=$(DEB_DESTDIR_UDEB)/var XKB_BASE=$(DEB_DESTDIR_UDEB)/usr/share/X11/xkb $(MAKE) -C libdde-linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install # runsystem is managed by update-alternatives @@ -83,7 +83,7 @@ override_dh_auto_install: # remove PIC static libraries rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a - rm -f debian/tmp-udeb/lib/$(DEB_HOST_MULTIARCH)/*_pic.a + rm -f debian/tmp-udeb/lib/*_pic.a override_dh_install: $(INSTALL_generated) dh_install $(addprefix -p,$(filter %-udeb,$(shell dh_listpackages))) --sourcedir=debian/tmp-udeb -- cgit v1.2.3