diff options
| author | Pino Toscano <pino@debian.org> | 2013-09-23 16:21:06 +0200 |
|---|---|---|
| committer | Pino Toscano <pino@debian.org> | 2013-09-23 16:33:37 +0200 |
| commit | 6ade69c00ef15e4fdebc8bd23bb73bdd66e4d78c (patch) | |
| tree | ebeefe595fc93a29ac915a4eaaf54c53cf1769e0 /debian | |
| parent | 22519b2e328df91a60fce2ee197637d4efcb6af7 (diff) | |
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
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/hurd-libs0.3-udeb.install.in | 2 | ||||
| -rw-r--r-- | debian/hurd-udeb.install.in | 6 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/hurd-libs0.3-udeb.install.in b/debian/hurd-libs0.3-udeb.install.in index fcb97710..005ac229 100644 --- a/debian/hurd-libs0.3-udeb.install.in +++ b/debian/hurd-libs0.3-udeb.install.in @@ -1 +1 @@ -lib/@DEB_HOST_MULTIARCH@/*.so.* lib +lib/*.so.* diff --git a/debian/hurd-udeb.install.in b/debian/hurd-udeb.install.in index 5a3f994e..5e0feeb5 100644 --- a/debian/hurd-udeb.install.in +++ b/debian/hurd-udeb.install.in @@ -58,9 +58,9 @@ hurd/streamio hurd/symlink hurd/term hurd/tmpfs -lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_kbd.so.* usr/lib/hurd/console -lib/@DEB_HOST_MULTIARCH@/hurd/console/pc_mouse.so.* usr/lib/hurd/console -lib/@DEB_HOST_MULTIARCH@/hurd/console/vga.so.* usr/lib/hurd/console +lib/hurd/console/pc_kbd.so.* usr/lib/hurd/console +lib/hurd/console/pc_mouse.so.* usr/lib/hurd/console +lib/hurd/console/vga.so.* usr/lib/hurd/console lib/hurd/console-run sbin sbin/MAKEDEV sbin/e2os 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 |