debian: clean up conditional fuse2fs pacakge build rules

There's no point conditionalizing fuse2fs in the control file, since
we control whether or not fuse2fs is built in the rules file, and the
control file is going to be the same when built on all of the debian
build servers.

Also key off of DEB_HOST_ARCH_OS to determine whether or not we are
building for the Hurd, and define it so the right thing happens if
./debian/rules is run by hand on a Hurd system.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/debian/control.in b/debian/control.in
index a8ba5f52c3a2161d12af0f9eac4e82eb132176bc..d851b3dcd76cf48f8da5bd017fabcbe53f8df1ff 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,6 @@ Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any
 Standards-Version: 4.0.0
 Homepage: http://e2fsprogs.sourceforge.net
 
-ifdef(`FUSE2FS',``
 Package: fuse2fs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -15,7 +14,6 @@ Description: ext2 / ext3 / ext4 file system driver for FUSE
  fuse2fs is a FUSE file system client that supports reading and
  writing from devices or image files containing ext2, ext3, and ext4
  file systems.
-'')dnl
 
 ifdef(`E2FSCK_STATIC',``
 Package: e2fsck-static

diff --git a/debian/rules b/debian/rules
index a2eac6d6ee3b36edc5567dca04733d2cd47b2390..81eafc31567c758cc800cb881ee2177d81e0a23c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -22,11 +22,12 @@ DEB_HOST_OS         ?= $(shell dpkg-architecture -qDEB_HOST_OS)
 DEB_HOST_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE     ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_MULTIARCH     ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_OS       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 # Allow distro-specific behaviour
 DISTRO :=$(shell sed -ne '/DISTRIB_ID/s/.*=//p' /etc/lsb-release 2>/dev/null || echo Debian)
 
-ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu)
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
 SKIP_FUSE2FS=yes
 endif
 
@@ -180,12 +181,6 @@ else
 M4_ARGS+=-UUDEB_PKGS
 endif
 
-ifeq ($(SKIP_FUSE2FS),)
-M4_ARGS+=-DFUSE2FS
-else
-M4_ARGS+=-UFUSE2FS
-endif
-
 debian-files: debian/control
 
 mrproper: clean
@@ -333,7 +328,7 @@ ifneq ($(BUILD_E2FSCK_STATIC),no)
        cp ${mandir}/man8/e2fsck.8 ${mandir}/man8/e2fsck.static.8
 endif
 
-ifeq ($(DEB_BUILD_GNU_SYSTEM), gnu) 
+ifeq ($(DEB_HOST_ARCH_OS), hurd)
        ${INSTALL} -m 0644 misc/mke2fs-hurd.conf ${tmpdir}/etc/mke2fs.conf
 endif