diff options
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/hurd-doc.docs | 2 | ||||
| -rwxr-xr-x | debian/rules | 12 |
3 files changed, 8 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index 5394d32f..e93728ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ hurd (20130916-2) UNRELEASED; urgency=low of the shlibs for hurd, which has no public libraries anymore after the hurd-libs0.3 split. * run.patch: refresh to apply without fuzz. + * Rename the "build" build dir to "build-deb". -- Samuel Thibault <sthibault@debian.org> Tue, 17 Sep 2013 19:42:22 +0200 diff --git a/debian/hurd-doc.docs b/debian/hurd-doc.docs index beba2b2e..62ea5fe9 100644 --- a/debian/hurd-doc.docs +++ b/debian/hurd-doc.docs @@ -1,2 +1,2 @@ -build/doc/hurd +build-deb/doc/hurd doc/navigating diff --git a/debian/rules b/debian/rules index 7c6d57de..c01ade83 100755 --- a/debian/rules +++ b/debian/rules @@ -30,15 +30,15 @@ INSTALL_in := $(wildcard debian/*.install.in) INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in)) %: - dh $@ -Bbuild --with autotools_dev,autoreconf + dh $@ -Bbuild-deb --with autotools_dev,autoreconf override_dh_auto_configure: - dh_auto_configure -Bbuild -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure) + dh_auto_configure -Bbuild-deb -- $(CONFIGURE_ARGS) $(shell dpkg-buildflags --export=configure) override_dh_auto_build: - dh_auto_build -Bbuild - cd build/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi - $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build + dh_auto_build -Bbuild-deb + cd build-deb/doc && make && makeinfo --html --split=chapter ../../doc/hurd.texi + $(MAKE) -C libdde-linux26 BUILDDIR=$(CURDIR)/build-deb override_dh_auto_clean: dh_auto_clean @@ -49,7 +49,7 @@ override_dh_auto_clean: rm -f $(INSTALL_generated) override_dh_auto_install: - dh_auto_install -Bbuild --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-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 $(MAKE) -C libdde-linux26 INSTALLDIR=$(CURDIR)/debian/tmp/usr/share/libdde_linux26/build/include install # runsystem is managed by update-alternatives |