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

diff --git a/debian/rules b/debian/rules
index 3673f1a..3ef3fac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
@@ -92,7 +93,6 @@ binary-arch: build
 	dh_compress -a
 	dh_movefiles -a --sourcedir=debian/amanda-common
 	rm -r $(r)/usr/share/amanda
-	rm $(s)/usr/lib/amanda/chg-mtx
 	dh_fixperms -av
 	# fix perms manually
 	chown -R backup:backup debian/*/var/lib/*
@@ -126,13 +126,13 @@ binary-arch: build
 		$(s)/usr/sbin/amcheck
 	install -o root -g root -m 0644 debian/amanda-client.lintian \
 		$(c)/usr/share/lintian/overrides/amanda-client
-#	install -o root -g root -m 0644 debian/amanda-common.lintian \
-#		$(r)/usr/share/lintian/overrides/amanda-common
+	install -o root -g root -m 0644 debian/amanda-common.lintian \
+		$(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 -pamanda-common --noscripts
 	dh_installdeb -a
-	dh_perl -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...