Adapt to the new automakified build system:

- New D and D_DBG variables pointing to the package destination dirs.
- Remove debian/rules.options, now unneeded with the default configure
  options, except for '--enable-sis900' which is not enabled by default.
- Pass --prefix and --exec-prefix to configure.
- Use DESTDIR instead of passing the prefix and exec_prefix variables.
- Merge the install-gnumach-dbg and install-gnumach targets into install.
- Call install instead of install-kernel and install-headers for the
  default build.
- Call install-exec instead of install-kernel for the -dbg build.
- Use dh_install to install files from D and D_DBG into the proper
  package dirs.
- Disable dh_installinfo.
- debian/gnumach-dbg.install: New file.
- debian/gnumach-dev.install: Likewise.
- debian/gnumach.install: Likewise.
- debian/gnumach-udeb.install: Likewise.

6 files changed, 46 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index cdcd545..bb6bf4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
 gnumach (2:1.3.99.dfsg.1-1) UNRELEASED; urgency=low
 
   * New upstream CVS snapshot.
-    - Remove debian/rules.options, now unneeded with the default configure
-      options.
     - debian/patches/01_gcc-4.1.patch: Removed, merged upstream.
     - debian/patches/00_clean_gfdl.patch: Sync.
     - debian/patches/05_halt_on_panic_flag.patch: Likewise.
@@ -20,6 +18,23 @@ gnumach (2:1.3.99.dfsg.1-1) UNRELEASED; urgency=low
     - debian/patches/90_autoconf_autogen.patch: Regenerated.
     - debian/patches/61_vm_resident-zoned.patch: Disable for now, it's
       causing problems with current applied patches in CVS.
+  * Adapt to the new automakified build system:
+    - New D and D_DBG variables pointing to the package destination dirs.
+    - Remove debian/rules.options, now unneeded with the default configure
+      options, except for '--enable-sis900' which is not enabled by default.
+    - Pass --prefix and --exec-prefix to configure.
+    - Use DESTDIR instead of passing the prefix and exec_prefix variables.
+    - Merge the install-gnumach-dbg and install-gnumach targets into install.
+    - Call install instead of install-kernel and install-headers for the
+      default build.
+    - Call install-exec instead of install-kernel for the -dbg build.
+    - Use dh_install to install files from D and D_DBG into the proper
+      package dirs.
+    - Disable dh_installinfo.
+    - debian/gnumach-dbg.install: New file.
+    - debian/gnumach-dev.install: Likewise.
+    - debian/gnumach.install: Likewise.
+    - debian/gnumach-udeb.install: Likewise.
   * Document the removal of the non-free GFDL manual in debian/copyright.
   * Remove the stamp file for the -dbg build.
   * Cleanup debian/rules file:
diff --git a/debian/gnumach-dbg.install b/debian/gnumach-dbg.install
new file mode 100644
index 0000000..36ef4c3
--- /dev/null
+++ b/debian/gnumach-dbg.install
@@ -0,0 +1 @@
+boot
diff --git a/debian/gnumach-dev.install b/debian/gnumach-dev.install
new file mode 100644
index 0000000..e43b95c
--- /dev/null
+++ b/debian/gnumach-dev.install
@@ -0,0 +1 @@
+usr/include
diff --git a/debian/gnumach-udeb.install b/debian/gnumach-udeb.install
new file mode 100644
index 0000000..36ef4c3
--- /dev/null
+++ b/debian/gnumach-udeb.install
@@ -0,0 +1 @@
+boot
diff --git a/debian/gnumach.install b/debian/gnumach.install
new file mode 100644
index 0000000..2024141
--- /dev/null
+++ b/debian/gnumach.install
@@ -0,0 +1,2 @@
+boot
+usr/share/msgids
diff --git a/debian/rules b/debian/rules
index 80da9f0..e4bfb5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,9 @@ pkg_udeb := gnumach-udeb
 pkg_dbg := gnumach-dbg
 pkg_dev := gnumach-dev
 
+D := $(CURDIR)/debian/tmp
+D_DBG := $(D)-dbg
+
 DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
@@ -32,7 +35,9 @@ stamp-configure:
 	-mkdir build
 	cd build && ../configure $(drivers) \
 		CFLAGS="$(CFLAGS)" \
-		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+		--prefix=/usr \
+		--exec-prefix=/
 	
 	touch stamp-configure
 
@@ -43,7 +48,8 @@ stamp-configure-dbg:
 	-mkdir build-dbg
 	cd build-dbg && ../configure --enable-kdb $(drivers) \
 		CFLAGS="$(CFLAGS)" \
-		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+		--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
+		--exec-prefix=/
 	
 	touch stamp-configure-dbg
 
@@ -67,44 +73,36 @@ clean: unpatch
 	
 	dh_clean
 
-install-gnumach: build-gnumach
+install: build-gnumach build-gnumach-dbg
 	dh_testdir
 	dh_testroot
-	dh_clean -N$(pkg_dbg) -k
-	dh_installdirs -N$(pkg_dbg)
-	
-	$(MAKE) -C build install-kernel \
-		exec_prefix=$(CURDIR)/debian/$(pkg)
+	dh_clean -a -k
+	-rm -rf $(D_DBG)
+	dh_installdirs -a
 	
-	$(MAKE) -C build install-kernel \
-		exec_prefix=$(CURDIR)/debian/$(pkg_udeb)
+	$(MAKE) -C build install \
+		DESTDIR=$(D)
 	
-	$(MAKE) -C build install-headers \
-		prefix=$(CURDIR)/debian/$(pkg_dev)/usr \
-		exec_prefix=$(CURDIR)/debian/$(pkg_dev) \
-		includedir=\$${prefix}/include
-
-install-gnumach-dbg: build-gnumach-dbg
-	dh_testdir
-	dh_testroot
-	dh_clean -p$(pkg_dbg) -k
-	dh_installdirs -p$(pkg_dbg)
+	$(MAKE) -C build-dbg install-exec \
+		DESTDIR=$(D_DBG) \
 	
-	$(MAKE) -C build-dbg install-kernel \
-		prefix=$(CURDIR)/debian/$(pkg_dbg)/usr \
-		exec_prefix=$(CURDIR)/debian/$(pkg_dbg)
-	mv debian/$(pkg_dbg)/boot/gnumach debian/$(pkg_dbg)/boot/gnumach-dbg
+	mv $(D_DBG)/boot/gnumach $(D_DBG)/boot/gnumach-dbg
 
 binary: binary-indep binary-arch
 
 binary-indep:
 
-binary-arch: install-gnumach install-gnumach-dbg
+binary-arch: install
 	dh_testdir
 	dh_testroot
+	
+	dh_install -a -N$(pkg_dbg) --sourcedir=$(D)
+	dh_install -p$(pkg_dbg) --sourcedir=$(D_DBG)
+	
 	dh_installdocs -a
 	dh_installchangelogs -a -k ChangeLog
-	dh_installinfo -a
+#	dh_installinfo -a
+	
 	dh_link -a
 	dh_strip -a -N$(pkg_dbg)
 	dh_compress -p$(pkg) -p$(pkg_udeb) -A boot/gnumach