X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=3ef3fac3f6f209a1fd7cb62af27e1da2781ee7f3;hb=e45061df5aeed15082a079565608ef9716921392;hp=c9c34fcda76bdbbe4ea00c30b2837b495cc2b4e9;hpb=b2afeabd945019dc648c1b51c10c01557c930434;p=debian%2Famanda

diff --git a/debian/rules b/debian/rules
index c9c34fc..3ef3fac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ configure-stamp:
 		--bindir=/usr/sbin \
 		--libexecdir=/usr/lib/amanda \
 		--without-amlibexecdir \
-		--with-amperldir=/usr/share/perl
+		--without-amperldir \
 		--sysconfdir=/etc \
 		--sharedstatedir=/var/lib \
 		--localstatedir=/var/lib \
@@ -42,7 +42,8 @@ configure-stamp:
 		--with-ssh-security \
 		--with-bsdtcp-security \
 		--with-bsdudp-security \
-		--without-ipv6
+		--without-ipv6 \
+		--enable-s3-device
 
 	touch missing
 	touch configure-stamp
@@ -50,7 +51,7 @@ configure-stamp:
 build: build-stamp 
 build-stamp: configure-stamp
 	dh_testdir
-	MAILER=/usr/bin/mail make CFLAGS="-O2 -g -Wall \
+	MAILER=/usr/bin/mail $(MAKE) CFLAGS="-O2 -g -Wall \
 		-DAMANDATES_FILE='\"/var/lib/amanda/amandates\"' \
 		-DIGNORE_TAR_ERRORS "
 	touch build-stamp
@@ -91,7 +92,7 @@ binary-arch: build
 	dh_strip -a
 	dh_compress -a
 	dh_movefiles -a --sourcedir=debian/amanda-common
-	rm $(s)/usr/lib/amanda/chg-mtx
+	rm -r $(r)/usr/share/amanda
 	dh_fixperms -av
 	# fix perms manually
 	chown -R backup:backup debian/*/var/lib/*
@@ -104,6 +105,9 @@ binary-arch: build
 	chmod -R u=rwX,g=rwX,o-rwx $(c)/var/lib/amanda/gnutar-lists
 	# .. setuid
 	chown root:backup \
+		$(c)/usr/lib/amanda/application/amgtar \
+		$(c)/usr/lib/amanda/application/amstar \
+		$(c)/usr/lib/amanda/calcsize \
 		$(c)/usr/lib/amanda/killpgrp \
 		$(c)/usr/lib/amanda/rundump \
 		$(c)/usr/lib/amanda/runtar \
@@ -111,6 +115,9 @@ binary-arch: build
 		$(s)/usr/lib/amanda/planner \
 		$(s)/usr/sbin/amcheck
 	chmod u=srwx,g=rx,o=r \
+		$(c)/usr/lib/amanda/application/amgtar \
+		$(c)/usr/lib/amanda/application/amstar \
+		$(c)/usr/lib/amanda/calcsize \
 		$(c)/usr/lib/amanda/killpgrp \
 		$(c)/usr/lib/amanda/rundump \
 		$(c)/usr/lib/amanda/runtar \
@@ -123,8 +130,9 @@ binary-arch: build
 		$(r)/usr/share/lintian/overrides/amanda-common
 	install -o root -g root -m 0644 debian/amanda-server.lintian \
 		$(s)/usr/share/lintian/overrides/amanda-server
-	dh_makeshlibs -a
+	dh_makeshlibs -pamanda-common --noscripts
 	dh_installdeb -a
+	dh_perl -a usr/lib/amanda/perl
 	dh_shlibdeps -a -l"debian/amanda-common/usr/lib:debian/amanda-client/usr/lib:debian/amanda-server/usr/lib"
 	# strip out the non-versioned amanda-common references, we need
 	# the versioned ones in the control file and dupes are ugly...