From 36ad344673731ae1ccff4a3d110616f20c04cf09 Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Mon, 14 May 2018 00:34:09 +0200
Subject: [PATCH] fix build of Win32 installer

---
 install/Makefile         | 19 ++++++++++++-------
 install/WinInstaller.nsi |  4 ++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/install/Makefile b/install/Makefile
index c8bacda7..543a9fc6 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -1,18 +1,23 @@
+# (c) 2018 Thomas Bernard
+
+MAKENSIS = makensis
+UNZIP = unzip -o
+SED = sed
+
 VERSIONTAG = ../obj/win32/versiontag
 VERSION := $(shell cat $(VERSIONTAG))
 
 SOURCES = ../src-$(VERSION).tgz
-INSTALLER = ../grafx2-$(VERSION).win32.exe
+INSTALLER = grafx2-$(VERSION).win32.exe
 
 all:	$(INSTALLER)
 
 $(INSTALLER):	WinInstaller.nsi $(SOURCES) $(VERSIONTAG)
-	sed 's/src-.*.tgz/src-$(VERSION).tgz/' $< | \
-	sed 's/VERSION .*/VERSION $(VERSION)/' > new_$<
-	makensis new_$<
+	$(SED) 's/VERSION .*/VERSION $(VERSION)/' $< | $(MAKENSIS) -
 
 $(SOURCES):	../grafx2-$(VERSION)-win32.zip 
-	cd .. && unzip grafx2-$(VERSION)-win32.zip src-$(VERSION).tgz
+	cd .. && $(UNZIP) grafx2-$(VERSION)-win32.zip src-$(VERSION).tgz
+	touch $@
 
-../grafx2-$(VERSION)-win32.zip:
-	cd ../src && WIN32CROSS=1 make ziprelease
+../grafx2-$(VERSION)-win32.zip:	$(VERSIONTAG)
+	cd ../src && WIN32CROSS=1 $(MAKE) ziprelease
diff --git a/install/WinInstaller.nsi b/install/WinInstaller.nsi
index 081ad116..4a1e30f9 100644
--- a/install/WinInstaller.nsi
+++ b/install/WinInstaller.nsi
@@ -84,7 +84,7 @@ Section "Grafx2" SecProgram
   SetOutPath "$INSTDIR"
   ;ADD YOUR OWN FILES HERE...
   File ..\src\gfx2.ico
-  File "..\src-${VERSION}-HEAD.tgz"
+  File "..\src-${VERSION}.tgz"
   SetOutPath "$INSTDIR\bin"
   File ..\bin\grafx2.exe
   File ..\bin\SDL_image.dll
@@ -180,7 +180,7 @@ Section "un.SecProgram"
   ;ADD YOUR OWN FILES HERE...
   Delete "$INSTDIR\gfx2.ico"
   Delete "$INSTDIR\bin\grafx2.exe"
-  Delete "$INSTDIR\src-${VERSION}-HEAD.tgz"
+  Delete "$INSTDIR\src-${VERSION}.tgz"
   Delete "$INSTDIR\share\grafx2\gfx2.gif"
   Delete "$INSTDIR\share\grafx2\gfx2def.ini"
   Delete "$INSTDIR\bin\SDL_image.dll"