X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=6ed8fe2060cf0ee32c0e48594079e16f33de9433;hb=8b02ebd2bbb5c2fdb56fc9a449061919297d6889;hp=fe0fc0a3f41c59556eda6808ca65b3ecac60af58;hpb=38f082c50347e6d90cb93307c1077c68cd238d76;p=debian%2Ftar

diff --git a/debian/rules b/debian/rules
index fe0fc0a3..6ed8fe20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,16 +11,25 @@ CFLAGS += -Wall
 LDFLAGS += `dpkg-buildflags --get LDFLAGS`
 CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
 
+export BUILD_DATE = $(shell dpkg-parsechangelog | sed -n -e 's/^Date: //p')
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  MAKEFLAGS += -j$(NUMJOBS)
+endif
+
 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
+	autoreconf --force -v --install
 	RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure \
 		--prefix=/usr \
-		--libexecdir=/usr/sbin \
+		--libexecdir=/usr/lib/tar \
 		--enable-backup-scripts \
 		--with-lzma=xz \
+		--disable-silent-rules \
 		$(CONFARGS) 
 	touch configure-stamp
 
@@ -29,7 +38,8 @@ 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)
+	RSH="/usr/bin/rsh" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" $(MAKE) $(MAKEFLAGS)
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
@@ -43,31 +53,31 @@ ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 endif
 endif
 
-	perl debian/tarman > debian/tar.1
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp debian/tar.1
+	rm -f build-stamp configure-stamp
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	make install bindir=`pwd`/debian/tar/bin prefix=`pwd`/debian/tar/usr \
-		libexecdir=`pwd`/debian/tar/usr/sbin 
+		libexecdir=`pwd`/debian/tar/usr/lib/tar 
 	install -m 755 debian/rmt.sh debian/tar/etc/rmt
-	mv debian/tar/usr/sbin/rmt debian/tar/usr/sbin/rmt-tar
+	mv debian/tar/usr/lib/tar/rmt debian/tar/usr/sbin/rmt-tar
 	install -m 755 debian/tarcat debian/tar/usr/sbin/tarcat
 
-	mv debian/tar/usr/sbin/backup* debian/tar-scripts/usr/sbin/
-	mv debian/tar/usr/sbin/restore debian/tar-scripts/usr/sbin/
-	mv debian/tar/usr/sbin/dump-remind debian/tar-scripts/usr/sbin/
+	mv debian/tar/usr/sbin/backup debian/tar-scripts/usr/sbin/tar-backup
+	mv debian/tar/usr/sbin/restore debian/tar-scripts/usr/sbin/tar-restore
+	mv debian/tar/usr/lib/tar/backup.sh debian/tar-scripts/usr/lib/tar/
+	mv debian/tar/usr/lib/tar/dump-remind debian/tar-scripts/usr/lib/tar/
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -84,7 +94,7 @@ binary-arch: build install
 	dh_installexamples
 	dh_installmenu
 	dh_installcron
-	dh_installman debian/tar.1 debian/rmt.8 debian/tarcat.1
+	dh_installman doc/tar.1 doc/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