use xz when lzma is called for

[tar] / debian / rules

diff --git a/debian/rules b/debian/rules
index a8b047fbfd3f27ab8e4b551277ab86ec204c092d..3d6913c625fa3bedbbf5594d54d497de1341374a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,36 +9,35 @@ endif
 configure: configure-stamp
 configure-stamp:
        dh_testdir
-
-       RSH="/usr/bin/rsh" CFLAGS="-O2 -g -Wall" \
-               ./configure --prefix=/usr --libexecdir=/usr/sbin $(CONFARGS)
-
+       cp -f /usr/share/misc/config.sub build-aux/config.sub
+       cp -f /usr/share/misc/config.guess build-aux/config.guess
+       RSH="/usr/bin/rsh" CFLAGS="-O2 -g -Wall" ./configure \
+               --prefix=/usr \
+               --libexecdir=/usr/sbin \
+               --with-lzma=xz \
+               $(CONFARGS) 
        touch configure-stamp
 
-build: configure-stamp build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: configure-stamp
        dh_testdir
-
        RSH="/usr/bin/rsh" CFLAGS="-O2 -g -Wall -fno-gnu89-inline" $(MAKE)
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
        (cd tests ; $(MAKE) clean)
        $(MAKE) check
+endif
 endif
 
+       perl debian/tarman > debian/tar.1
        touch build-stamp
 
 clean:
        dh_testdir
        dh_testroot
-       rm -f build-stamp configure-stamp
-
+       rm -f build-stamp configure-stamp debian/tar.1
        [ ! -f Makefile ] || $(MAKE) distclean
-
-       -test -r /usr/share/misc/config.sub && \
-               cp -f /usr/share/misc/config.sub build-aux/config.sub
-       -test -r /usr/share/misc/config.guess && \
-               cp -f /usr/share/misc/config.guess build-aux/config.guess
-
        dh_clean
 
 install: build