Installed gpgwrap from d.rules for consistency purpose.

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@405 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/debian/patches/gpgwrap_makefile.diff b/debian/patches/gpgwrap_makefile.diff
index 51930f1d321e86183dfe61b8d0189d570a6dad70..114dd01dd2b3f8e40a3349c4a750322670733232 100644 (file)
--- a/debian/patches/gpgwrap_makefile.diff
+++ b/debian/patches/gpgwrap_makefile.diff
@@ -1,24 +1,36 @@
 From: Franck Joncourt <franck.mail@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@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

diff --git a/debian/rules b/debian/rules
index de04816ccece7bb77e1431a482532cbb641ee8d0..12f7677759bd5e8fcdd9802e82245e18884876a4 100755 (executable)
--- 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,7 +42,6 @@ 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_DATA) caff/README \
@@ -50,8 +50,13 @@ 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