projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Debian package: small cleanups.
[pgp-tools.git]
/
debian
/
rules
diff --git
a/debian/rules
b/debian/rules
index de04816ccece7bb77e1431a482532cbb641ee8d0..b863c7348db5919684c3ca58a6242561bb6b696b 100755
(executable)
--- a/
debian/rules
+++ b/
debian/rules
@@
-1,7
+1,5
@@
#!/usr/bin/make -f
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
-
VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
INSTALL = install
VERSION := $(shell dpkg-parsechangelog | grep ^Version | cut -d' ' -f2)
INSTALL = install
@@
-12,6
+10,7
@@
GPGDIR_DIR = gpgdir
GPGDIR_PROG = gpgdir
GPGWRAP_DIR = gpgwrap
GPGDIR_PROG = gpgdir
GPGWRAP_DIR = gpgwrap
+GPGWRAP_PROG = bin/gpgwrap
DESTDIR = $(CURDIR)/debian/signing-party
DESTDIR_BIN = $(DESTDIR)/usr/bin
DESTDIR = $(CURDIR)/debian/signing-party
DESTDIR_BIN = $(DESTDIR)/usr/bin
@@
-22,13
+21,15
@@
configure-stamp:
dh_testdir
touch $@
dh_testdir
touch $@
-build: build-stamp
-build-stamp: $(QUILT_STAMPFN) configure-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: configure-stamp
dh_testdir
$(MAKE)
touch $@
dh_testdir
$(MAKE)
touch $@
-clean:
unpatch
+clean:
dh_testdir
dh_testroot
$(MAKE) clean
dh_testdir
dh_testroot
$(MAKE) clean
@@
-38,10
+39,9
@@
clean: unpatch
install: build
dh_testdir
dh_testroot
install: build
dh_testdir
dh_testroot
- dh_
clean -k
+ dh_
prep
dh_installdirs
$(MAKE) install DESTDIR=$(DESTDIR)
dh_installdirs
$(MAKE) install DESTDIR=$(DESTDIR)
- $(INSTALL_PROGRAM) $(GPGDIR_DIR)/$(GPGDIR_PROG) $(DESTDIR_BIN)
dh_install
dh_installman */*.1 */*/*.1
$(INSTALL_DATA) caff/README \
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
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_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
$(INSTALL_DATA) $(GPGWRAP_DIR)/NEWS $(DESTDIR_DOC)/changelog.gpgwrap
- # ignore errors with older debhelper versions
-
-
dh_lintian
+
+ dh_lintian
binary-indep: build install
binary-indep: build install
+binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs
dh_testdir
dh_testroot
dh_installdocs
@@
-73,8
+78,6
@@
binary-indep: build install
dh_md5sums
dh_builddeb
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
.PHONY: build clean binary-indep binary-arch binary install configure