X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=debian%2Frules;h=cfcea3c67137386b4ed3ef250501eb2858c647b5;hb=67ca0acf211ffe2b7510effba18c5ec878c36df0;hp=a660382436995bfd4fbb803bcc60468f4b1a1b41;hpb=e42e37555ad80944d211fc7369e910ee78f6d8f0;p=pgp-tools.git

diff --git a/debian/rules b/debian/rules
index a660382..cfcea3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,20 @@ include /usr/share/quilt/quilt.make
 
 VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
 
+INSTALL             = install
+INSTALL_PROGRAM     = $(INSTALL)
+INSTALL_DATA        = $(INSTALL) -m 644
+
+GPGDIR_DIR          = gpgdir
+GPGDIR_PROG         = gpgdir
+
+GPGWRAP_DIR         = gpgwrap
+GPGWRAP_PROG        = bin/gpgwrap
+
+DESTDIR             = $(CURDIR)/debian/signing-party
+DESTDIR_BIN         = $(DESTDIR)/usr/bin
+DESTDIR_DOC         = $(DESTDIR)/usr/share/doc/signing-party
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
@@ -25,22 +39,28 @@ clean: unpatch
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/signing-party
+	$(MAKE) install DESTDIR=$(DESTDIR)
 	dh_install
 	dh_installman */*.1 */*/*.1
-	install -d $(CURDIR)/debian/signing-party/usr/share/doc/signing-party/caff
-	install -m 644 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
-	# ignore errors with older debhelper versions
-	-dh_lintian
+	$(INSTALL_DATA) caff/README \
+			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
+	
+	dh_lintian
 
 binary-indep: build install
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
@@ -48,6 +68,7 @@ binary-indep: build install
 	dh_installcron
 	dh_installinfo
 	dh_installchangelogs
+	dh_perl
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -57,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