diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/hurd-dev.install | 5 | ||||
| -rwxr-xr-x | debian/rules | 22 |
3 files changed, 22 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 73f198f8..9501e113 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +hurd (20120219-2) UNRELEASED; urgency=low + + * Add libddekit and libdde_linux26 headers. + + -- Samuel Thibault <sthibault@debian.org> Tue, 21 Feb 2012 23:50:45 +0000 + hurd (20120219-1) unstable; urgency=low [ Samuel Thibault ] diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install index 76681792..2bfce014 100644 --- a/debian/hurd-dev.install +++ b/debian/hurd-dev.install @@ -1,4 +1,7 @@ debian/tmp/lib/*.a lib debian/tmp/include/* usr/include debian/tmp/lib/*.so lib -lib/src/libdde_*.a usr/lib +libdde_linux26/lib/src/libdde_*.a usr/lib +libdde_linux26/mk usr/share/libdde_linux26 +libdde_linux26/Makeconf* usr/share/libdde_linux26 +debian/tmp/usr/share/libdde_linux26/build usr/share/libdde_linux26 diff --git a/debian/rules b/debian/rules index 42e58dc7..4ffe0fe3 100755 --- a/debian/rules +++ b/debian/rules @@ -29,25 +29,25 @@ DEB_MAKE_INSTALL_TARGET = install prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR DEB_DH_STRIP_ARGS := --dbg-package=hurd DEB_DH_MAKESHLIBS_ARGS_hurd := --add-udeb="hurd-udeb" +DDE_DRIVERS = e100 e1000 pcnet32 rtl8139 ne2k_pci + build/hurd:: cd $(DEB_BUILDDIR)/doc && texi2html -split chapter ../../doc/hurd.texi $(MAKE) -C libdde_linux26 BUILDDIR=$(CURDIR)/build - $(MAKE) -C dde_e100 BUILDDIR=$(CURDIR)/build - $(MAKE) -C dde_e1000 BUILDDIR=$(CURDIR)/build - $(MAKE) -C dde_pcnet32 BUILDDIR=$(CURDIR)/build - $(MAKE) -C dde_rtl8139 BUILDDIR=$(CURDIR)/build - $(MAKE) -C dde_ne2k_pci BUILDDIR=$(CURDIR)/build + for i in $(DDE_DRIVERS) ; \ + do \ + $(MAKE) -C dde_$$i BUILDDIR=$(CURDIR)/build || exit 1 ; \ + done clean:: $(MAKE) -C libdde_linux26 cleanall rm -f $$(find libdde_linux26 -name \*.d) rm -fr libdde_linux26/build rm -fr libdde_linux26/lib/src/gen_crc32table libdde_linux26/lib/src/crc32table.h libdde_linux26/lib/src/timeconst.h - $(MAKE) -C dde_e100 cleanall - $(MAKE) -C dde_e1000 cleanall - $(MAKE) -C dde_pcnet32 cleanall - $(MAKE) -C dde_rtl8139 cleanall - $(MAKE) -C dde_ne2k_pci cleanall + for i in $(DDE_DRIVERS) ; \ + do \ + $(MAKE) -C dde_$$i cleanall ; \ + done install/hurd:: # runsystem is managed by update-alternatives @@ -72,6 +72,8 @@ install/hurd:: install -m664 $(DEB_SRCDIR)/console/motd.UTF8 debian/hurd/etc/ install -m664 $(DEB_SRCDIR)/release/servers.boot debian/hurd/boot/ + $(MAKE) -C libdde_linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install + install/hurd-dev:: install -m644 debian/local/soundcard.h debian/tmp/include/sys install -m644 debian/local/cdrom.h debian/tmp/include/sys |