X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=70d35904c57972ab74fee3caf600792e95b9c0ab;hb=81dbbb70c5d177187bf4ba8885f86319e358ddb1;hp=8d4592bf2d27aa70f3fa3ce9e7c94f45d946e712;hpb=433ed330db63d8c4e06e046d2e3e820ceb7947a2;p=debian%2Famanda

diff --git a/debian/rules b/debian/rules
index 8d4592b..70d3590 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,14 +12,17 @@ r=$(shell pwd)/debian/amanda-common
 s=$(shell pwd)/debian/amanda-server
 c=$(shell pwd)/debian/amanda-client
 
-build: build-stamp 
-build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
+	# pick up latest config files provided by autotools-dev
+	cp -f /usr/share/misc/config.sub config/config.sub
+	cp -f /usr/share/misc/config.guess config/config.guess
 #	automake --foreign
 #	autoconf -l config
 	MAILER=/usr/bin/mail \
 	./configure --prefix=/usr --bindir=/usr/sbin --mandir=/usr/share/man \
-		--libexecdir=/usr/lib/amanda --enable-shared\
+		--with-amlibexecdir=/usr/lib/amanda --enable-shared \
 		--sysconfdir=/etc --localstatedir=/var/lib \
 		--with-gnutar-listdir=/var/lib/amanda/gnutar-lists \
 		--with-index-server=localhost \
@@ -27,12 +30,15 @@ build-stamp: /sbin/dump /usr/bin/smbclient debian/po/templates.pot
 		--with-bsd-security --with-amandahosts \
 		--with-smbclient=/usr/bin/smbclient \
 		--with-debugging=/var/log/amanda \
-		--with-dumperdir=/usr/lib/amanda/dumper.d \
 		--with-tcpportrange=50000,50100 --with-udpportrange=840,860 \
-		--with-maxtapeblocksize=256 \
 		--with-ssh-security \
 		--with-bsdtcp-security --with-bsdudp-security
 	touch missing
+	touch configure-stamp
+
+build: build-stamp 
+build-stamp: configure-stamp
+	dh_testdir
 	MAILER=/usr/bin/mail make CFLAGS="-O2 -g -Wall \
 		-DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
 		-DIGNORE_TAR_ERRORS "
@@ -43,22 +49,17 @@ clean:
 	dh_testroot
 	[ ! -f Makefile ] || make clean
 	[ ! -f Makefile ] || make distclean
-	-rm -f build-stamp missing config/config.h common-src/genversion
-	-rm -f debian/po/templates.pot
+	-rm -f build-stamp configure-stamp missing config/config.h common-src/genversion
 	-find . -type d -name .deps -exec rm -rf {} \;
-
-	-test -r /usr/share/misc/config.sub && \
-		cp -f /usr/share/misc/config.sub config/config.sub
-	-test -r /usr/share/misc/config.guess && \
-		cp -f /usr/share/misc/config.guess config/config.guess
-
-	debconf-updatepo
 	dh_clean
 
-# Build architecture-independent files here.
+# call this before packaging for upload when updating template English text
+updatepo:
+	-rm -f debian/po/templates.pot
+	debconf-updatepo
+	
 binary-indep: build
 
-# Build architecture-dependent files here.
 binary-arch: build
 	dh_testdir
 	dh_testroot
@@ -127,8 +128,5 @@ binary-arch: build
 source diff:                                                                  
 	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
 
-debian/po/templates.pot:	debian/templates
-	@debconf-updatepo
-
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary