X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=debian%2Frules;h=12f7677759bd5e8fcdd9802e82245e18884876a4;hb=b0438569dd9a7578dcc36df14079b142f717d6b1;hp=5dd1529388c147ccd5f188a47d1ba3135d5750f7;hpb=8542119444e2f6ea5fe122434f4e6fca0ad41209;p=pgp-tools.git

diff --git a/debian/rules b/debian/rules
index 5dd1529..12f7677 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ GPGDIR_DIR          = gpgdir
 GPGDIR_PROG         = gpgdir
 
 GPGWRAP_DIR         = gpgwrap
+GPGWRAP_PROG        = bin/gpgwrap
 
 DESTDIR             = $(CURDIR)/debian/signing-party
 DESTDIR_BIN         = $(DESTDIR)/usr/bin
@@ -41,18 +42,21 @@ install: build
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(DESTDIR)
-	$(INSTALL_PROGRAM) $(GPGDIR_DIR)/$(GPGDIR_PROG) $(DESTDIR_BIN)
 	dh_install
 	dh_installman */*.1 */*/*.1
-	install -d $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/caff
 	$(INSTALL_DATA) caff/README \
-		caff/README.gpg-agent \
-		caff/README.many-keys \
-		caff/README.v3-keys \
-		caff/caffrc.sample \
-			$(CURDIR)/debian/signing-party/usr/share/doc/signing-party/caff
+			caff/README.gpg-agent \
+			caff/README.many-keys \
+			caff/README.v3-keys \
+			caff/caffrc.sample \
+			$(DESTDIR_DOC)/caff
+	
+	$(INSTALL_PROGRAM) $(GPGDIR_DIR)/$(GPGDIR_PROG) $(DESTDIR_BIN)		
 	$(INSTALL_DATA) $(GPGDIR_DIR)/ChangeLog $(DESTDIR_DOC)/changelog.gpgdir
+	
+	$(INSTALL_PROGRAM) $(GPGWRAP_DIR)/$(GPGWRAP_PROG) $(DESTDIR_BIN)		
 	$(INSTALL_DATA) $(GPGWRAP_DIR)/NEWS $(DESTDIR_DOC)/changelog.gpgwrap
+	
 	# ignore errors with older debhelper versions
 	-dh_lintian
 
@@ -64,6 +68,7 @@ binary-indep: build install
 	dh_installcron
 	dh_installinfo
 	dh_installchangelogs
+	dh_perl
 	dh_strip
 	dh_compress
 	dh_fixperms