[Pgp-tools-commit] r405 - in trunk/debian: . patches
thialme-guest at alioth.debian.org
thialme-guest at alioth.debian.org
Tue Jan 27 18:47:50 UTC 2009
Author: thialme-guest
Date: 2009-01-27 18:47:50 +0000 (Tue, 27 Jan 2009)
New Revision: 405
Modified:
trunk/debian/patches/gpgwrap_makefile.diff
trunk/debian/rules
Log:
Installed gpgwrap from d.rules for consistency purpose.
Modified: trunk/debian/patches/gpgwrap_makefile.diff
===================================================================
--- trunk/debian/patches/gpgwrap_makefile.diff 2009-01-24 15:21:58 UTC (rev 404)
+++ trunk/debian/patches/gpgwrap_makefile.diff 2009-01-27 18:47:50 UTC (rev 405)
@@ -1,24 +1,36 @@
From: Franck Joncourt <franck.mail at dthconnex.com>
Subject: [PATCH] fixes/gpgwrap_makefile
-This allows gpgwrap to be installed with the main Makefile.
+This allows the main Makefile not to fail when trying to install gpgwrap.
+It just adds the install target in the gpgwrap Makefile.
+That could be avoided by handling differently the gpgwrap project in the main
+Makefile, but then it is going to be the mess.
+
+The new target does not install anything since so far the man page is currently
+installed from debian/rules, and thus everything to install gpgwrap is added to
+debian.rules for consistency purpose.
+
Signed-off-by: Franck Joncourt <franck.mail at dthconnex.com>
---
- gpgwrap/Makefile | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ gpgwrap/Makefile | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gpgwrap/Makefile b/gpgwrap/Makefile
-index 30064df..ff6ead2 100644
+index 30064df..3dc65b9 100644
--- a/gpgwrap/Makefile
+++ b/gpgwrap/Makefile
-@@ -5,5 +5,8 @@ MAKE=make
+@@ -1,9 +1,11 @@
+ MAKE=make
+
+-.PHONY: all clean
++.PHONY: all clean install
+
all:
cd src && ${MAKE} all DIET="${DIET}"
+install:
-+ install bin/gpgwrap $(DESTDIR)/usr/bin
+
clean:
cd src && ${MAKE} clean
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-01-24 15:21:58 UTC (rev 404)
+++ trunk/debian/rules 2009-01-27 18:47:50 UTC (rev 405)
@@ -12,6 +12,7 @@
GPGDIR_PROG = gpgdir
GPGWRAP_DIR = gpgwrap
+GPGWRAP_PROG = bin/gpgwrap
DESTDIR = $(CURDIR)/debian/signing-party
DESTDIR_BIN = $(DESTDIR)/usr/bin
@@ -41,7 +42,6 @@
dh_clean -k
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,8 +50,13 @@
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
More information about the Pgp-tools-commit
mailing list