[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.1.1-35-geba54f0

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, master has been updated
       via  eba54f0d253faf9cd0042d511138fb1e54ea3b38 (commit)
      from  14519cb404c42daf93a1fcd232f123a3890c02d9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eba54f0d253faf9cd0042d511138fb1e54ea3b38
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Jul 16 14:22:01 2013 +0000

    Remove duplicate -ex unpack and patch actions
    
        The -ex targets no longer unpack and patch. Already
        the same source directory was used for building and the
        differen pkgsdir caused patch to fail.
    
        * src/gpg4win.mk.in: Just depend on the normal stamps
        for ex-unpack and ex-patch.
    
    --
        It should be uneccessary to patch -ex and normal version
        differently. There might be problems now when there are postcfg
        patches that touch files which are not generated by configure.

diff --git a/src/gpg4win.mk.in b/src/gpg4win.mk.in
index 024b44f..ca6aac9 100644
--- a/src/gpg4win.mk.in
+++ b/src/gpg4win.mk.in
@@ -88,9 +88,9 @@ endef
 define SETVARS_EX
 	pkg="$(call GETVAR,gpg4win_pkg_$(1))";                              \
 	pkg_version="$(1)-$(call GETVAR,gpg4win_pkg_$(1)_version)";         \
-	pkgsdir="$(bdir)/$$$${pkg_version}-ex";                             \
+	pkgsdir="$(bdir)/$$$${pkg_version}";                                \
 	pkgbdir="$(bdir)/$$$${pkg_version}-ex-build";                       \
-	pkgpdir="$(pdir)/$$$${pkg_version}-ex";                             \
+	pkgpdir="$(pdir)/$$$${pkg_version}";                                \
 	pkgpbdir="$(pdir)/$(1)";                                            \
 	pkgidir="$(ex_ipdir)/$$$${pkg_version}";                            \
 	pkgidir_dev="$(ex_ipdir)/$$$${pkg_version_dev}";                    \
@@ -157,18 +157,10 @@ define EXPKG_template_
 
 pkg_files += $(call GETVAR,gpg4win_pkg_$(1))
 
-stamps/stamp-$(1)-ex-00-unpack: stamps/stamp-directories $(call GETDEPS_EX,$(1))
-	(cd $(bdir);					\
-	 $(call SETVARS_EX,$(1));				\
-	 $(call DEFLATE_macro,$$$${pkg}))
+stamps/stamp-$(1)-ex-00-unpack: stamps/stamp-$(1)-00-unpack
 	touch stamps/stamp-$(1)-ex-00-unpack
 
-stamps/stamp-$(1)-ex-01-patch: stamps/stamp-$(1)-ex-00-unpack
-	(shopt -s nullglob;				\
-	 $(call SETVARS_EX,$(1));				\
-	 for pfile in "$$$${pkgpbdir}"/*.patch "$$$${pkgpdir}"/*.patch ; do  \
-	   (cd "$$$${pkgsdir}"; "$$$${pfile}")		\
-	 done)
+stamps/stamp-$(1)-ex-01-patch: stamps/stamp-$(1)-ex-00-unpack stamps/stamp-$(1)-01-patch
 	touch stamps/stamp-$(1)-ex-01-patch
 
 stamps/stamp-$(1)-ex-02-configure: stamps/stamp-$(1)-ex-01-patch

-----------------------------------------------------------------------

Summary of changes:
 src/gpg4win.mk.in |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org