[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-2.3.0-122-g5be72de

[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  5be72deec35667f4772af524fcf8fcebf7ead534 (commit)
      from  e96082c958c7360db88661c48a35e012d7c856eb (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 5be72deec35667f4772af524fcf8fcebf7ead534
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Tue Mar 8 11:17:52 2016 +0100

    Fix removal of installer-options.nsi
    
    * src/Makefile.am (EXTRA_DIST): Remove installer-options.
    * src/installer.nsi: Don't Reserve file anymore

diff --git a/src/Makefile.am b/src/Makefile.am
index a1dc553..24f94b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -610,7 +610,7 @@ stamps/stamp-dist-self: versioninfo.txt
 
 installers/gpg4win-src-$(VERSION).exe: gpg4win-src.nsi $(common_nsii) \
                             stamps/stamp-final \
-                            stamps/stamp-dist-self installer-options.ini \
+                            stamps/stamp-dist-self \
 		            license.blurb
 	$(MAKENSIS) -V3 -DBUILD_DIR=`pwd` -DTOP_SRCDIR=$(top_srcdir) \
 	  -DSRCDIR=$(srcdir) $(EXTRA_MAKENSIS_FLAGS) $(srcdir)/gpg4win-src.nsi && \
diff --git a/src/installer.nsi b/src/installer.nsi
index 9be22c0..59ec917 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -247,7 +247,6 @@ ReserveFile "${TOP_SRCDIR}\doc\logo\gpg4win-logo-400px.bmp"
 ReserveFile "${TOP_SRCDIR}\src\gpg4win-splash.wav"
 !endif
 ReserveFile "${TOP_SRCDIR}\COPYING"
-ReserveFile "installer-options.ini"
 ReserveFile "${TOP_SRCDIR}\doc\logo\gpg4win-logo-164x314.bmp"
 
 # Language support

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

Summary of changes:
 src/Makefile.am   | 2 +-
 src/installer.nsi | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


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