diff -ruN xfsprogs/debian/rules xfsprogs_deb_rules_fix/debian/rules --- xfsprogs/debian/rules Mon Mar 24 21:48:48 2003 +++ xfsprogs_deb_rules_fix/debian/rules Thu Mar 27 20:10:45 2003 @@ -12,8 +12,8 @@ pkgbfs = DIST_ROOT=`pwd`/$(dirbfs); 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; -bfsopts = $(options); OPTIMIZER=-Os; LOCAL_CONFIGURE_OPTIONS="--enable-shared-uuid=yes --enable-gettext=no"; export OPTIMIZER LOCAL_CONFIGURE_OPTIONS; +options = DEBUG=-DNDEBUG; DISTRIBUTION=debian; LOCAL_CONFIGURE_OPTIONS=--enable-readline=yes; export DEBUG DISTRIBUTION LOCAL_CONFIGURE_OPTIONS +bfsopts = $(options); OPTIMIZER=-Os; LOCAL_CONFIGURE_OPTIONS="--enable-shared-uuid=yes --enable-gettext=no"; export OPTIMIZER LOCAL_CONFIGURE_OPTIONS checkdir = test -f debian/rules build: built @@ -26,14 +26,14 @@ .census: @echo "== dpkg-buildpackage: configure" 1>&2 $(checkdir) - $(options) $(MAKE) configure + $(options); $(MAKE) configure touch .census bfbuild: $(checkdir) @echo "== dpkg-buildpackage: bootfloppies" 1>&2 if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \ - $(bfsopts) $(MAKE) configure; \ + $(bfsopts); $(MAKE) configure; \ for dir in libxfs libdisk mkfs; do $(MAKE) -C $$dir; done; \ mv mkfs/mkfs.xfs mkfs/mkfs.xfs-$(bootpkg); \ $(MAKE) distclean; \