Keep packaging scripts in sync across all of the packages were maintaining here

Merge of master-melb:xfs-cmds:24301a by kenmcd.

diff --git a/debian/rules b/debian/rules
index 8f539c3ef5d17142dd7cb33d4176555a86598451..d019ee49bd7c3a1f3f5279d1a9eb438df11ff2af 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,11 @@ pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
 pkgdi  = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
 
-options = DEBUG=-DNDEBUG; DISTRIBUTION=debian; LOCAL_CONFIGURE_OPTIONS=--enable-readline=yes; export DEBUG DISTRIBUTION LOCAL_CONFIGURE_OPTIONS;
-diopts = $(options) OPTIMIZER=-Os; LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no"; export OPTIMIZER LOCAL_CONFIGURE_OPTIONS;
+options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
+         INSTALL_USER=root INSTALL_GROUP=root \
+         LOCAL_CONFIGURE_OPTIONS=--enable-readline=yes ;
+diopts  = $(options) \
+         export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no" ;
 checkdir = test -f debian/rules
 
 build: built
@@ -33,7 +36,7 @@ config: .census
        $(options) $(MAKE) configure
        touch .census
 
-dibuild: 
+dibuild:
        $(checkdir)
        @echo "== dpkg-buildpackage: installer" 1>&2
        if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \