X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Frules;h=f3918a45f104bd6a7f8b19c3f00e2016b271f7a1;hb=80c007832d90b84517736b733b3d1af9081e55ad;hp=3673f1a6eb5eb6b79e9eec800ae665cd2c6e9900;hpb=7906a3b9f861a26c6fd0423ca5232665d1b48caf;p=debian%2Famanda

diff --git a/debian/rules b/debian/rules
index 3673f1a..f3918a4 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
@@ -77,6 +78,7 @@ binary-arch: build
 	dh_clean -k
 	dh_installdirs -a
 	make install DESTDIR=$(r)
+	sed -i "/dependency_libs/ s/'.*'/''/" `find $(r)/usr/lib/amanda/ -name '*.la'`
 	install -m 644 debian/amandahosts $(r)/etc/amandahosts
 	dh_installdocs -a
 	dh_installexamples -a
@@ -92,7 +94,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 +127,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...