X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=debian%2Frules;h=cfcea3c67137386b4ed3ef250501eb2858c647b5;hb=4fa442ad671e887ce4c15d047b259fa30fbc13c5;hp=de04816ccece7bb77e1431a482532cbb641ee8d0;hpb=f54e6dbc01bf43889b5129fa65376899e102651d;p=pgp-tools.git

diff --git a/debian/rules b/debian/rules
index de04816..cfcea3c 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
@@ -38,10 +39,9 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(DESTDIR)
-	$(INSTALL_PROGRAM) $(GPGDIR_DIR)/$(GPGDIR_PROG) $(DESTDIR_BIN)
 	dh_install
 	dh_installman */*.1 */*/*.1
 	$(INSTALL_DATA) caff/README \
@@ -50,12 +50,17 @@ install: build
 			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
+	
+	dh_lintian
 
 binary-indep: build install
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
@@ -73,8 +78,6 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-# Build architecture-dependent files here.
-binary-arch: build install
+binary: binary-indep binary-arch
 
-binary: binary-indep
 .PHONY: build clean binary-indep binary-arch binary install configure