Bug#101697: gnumach: debian/rules build doesn't

[Robert Bihlmeyer]

Package: gnumach
Version: 1:1.2-10
Severity: important

The gnumach package expects to be built via dpkg-buildpackage, and doesn't
cope with good ole "debian/rules build". Naughty.

Patch follows. I've changed the make var names for consistency, so that
"debian/rules build DEB_BUILD_GNU_TYPE=foo" works the same as
"DEB_BUILD_GNU_TYPE=foo debian/rules build"

--- gnumach-1.2/debian/rules    Sun May 27 09:44:44 2001
+++ gnumach-1.2+/debian/rules   Sat May 26 18:53:12 2001
@@ -17,8 +17,8 @@
 # The name of the package (for example, `emacs').
 package   := gnumach
 package-dev := gnumach-dev
-BUILDARCH := $(DEB_BUILD_GNU_TYPE)
-HOSTARCH := $(DEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 # Configuration variables (these should be pretty generic)
 CC = cc
@@ -131,7 +132,7 @@
        --enable-ni52 --enable-ni65 \
        --enable-lance \
        --enable-tlan \
-       --build=$(BUILDARCH) --host=$(HOSTARCH)
+       --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
        touch stamp-configure
 
 all build: stamp-build