X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=0b85fbf7fffe78cd42f44953baa4a8a3a968e881;hb=742e8d8615e691277b67e5416340354b9879e2a9;hp=54246aecdd2afdbe506079dd2f76cae1a49d8951;hpb=3322ff6164a1e9dd3d1622c64a9b9b7c5f303ef6;p=debian%2Ftar

diff --git a/debian/rules b/debian/rules
index 54246aec..0b85fbf7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,22 +6,38 @@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 CONFARGS = --host=$(DEB_HOST_GNU_TYPE)
 endif
 
+CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS += -Wall
+LDFLAGS += `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
 	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 $(CONFARGS)
+	RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
+		--prefix=/usr \
+		--libexecdir=/usr/sbin \
+		--with-lzma=xz \
+		$(CONFARGS) 
 	touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: 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))
+	@runas=`whoami` ; \
+	if test $$runas = "root" ; \
+	then \
+	  echo "Sorry, but the test suite is not designed to be run as root."; \
+	  exit 1 ;\
+	fi
 	(cd tests ; $(MAKE) clean)
 	$(MAKE) check
 endif
@@ -47,6 +63,7 @@ install: build
 		libexecdir=`pwd`/debian/tar/usr/sbin 
 	install -m 755 debian/rmt.sh debian/tar/etc/rmt
 	mv debian/tar/usr/sbin/rmt debian/tar/usr/sbin/rmt-tar
+	install -m 755 debian/tarcat debian/tar/usr/sbin/tarcat
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -63,7 +80,7 @@ binary-arch: build install
 	dh_installexamples
 	dh_installmenu
 	dh_installcron
-	dh_installman debian/tar.1 debian/rmt.8
+	dh_installman debian/tar.1 debian/rmt.8 debian/tarcat.1
 	mv debian/tar/usr/share/man/man8/rmt.8 \
 	   debian/tar/usr/share/man/man8/rmt-tar.8
 	dh_installinfo