Author: cazfi
Date: Sun Aug 28 12:46:10 2016
New Revision: 33717

URL: http://svn.gna.org/viewcvs/freeciv?rev=33717&view=rev
Log:
Use arch-specific nsi file names when building msys2 based Windows Installers.

See patch #7658

Modified:
    branches/S2_6/win32/installer_msys2/Makefile

Modified: branches/S2_6/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33717&r1=33716&r2=33717&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Sun Aug 28 12:46:10 2016
@@ -336,19 +336,19 @@
        # extract Freeciv version
        $(eval FREECIV_VERSION := $(shell ../../fc_version))
        # create NSIS script
-       ./create-freeciv-$(GUI)-nsi.sh install-$(WINARCH)-$(GUI) 
$(FREECIV_VERSION) $(WINARCH) > Freeciv-$(FREECIV_VERSION)-$(GUI).nsi
+       ./create-freeciv-$(GUI)-nsi.sh install-$(WINARCH)-$(GUI) 
$(FREECIV_VERSION) $(WINARCH) > Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi
        # create installer executable
        mkdir -p Output
-       makensis Freeciv-$(FREECIV_VERSION)-$(GUI).nsi
+       makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-$(GUI).nsi
 
 installer-ruledit: clean-install-ruledit install-ruledit install-env-ruledit
        # extract Freeciv version
        $(eval FREECIV_VERSION := $(shell ../../fc_version))
        # create NSIS script
-       ./create-freeciv-ruledit-nsi.sh install-$(WINARCH)-ruledit 
$(FREECIV_VERSION) $(WINARCH) > Freeciv-$(FREECIV_VERSION)-ruledit.nsi
+       ./create-freeciv-ruledit-nsi.sh install-$(WINARCH)-ruledit 
$(FREECIV_VERSION) $(WINARCH) > 
Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit.nsi
        # create installer executable
        mkdir -p Output
-       makensis Freeciv-$(FREECIV_VERSION)-ruledit.nsi
+       makensis Freeciv-$(WINARCH)-$(FREECIV_VERSION)-ruledit.nsi
 
 wrap-gtk3: build-freeciv-gtk3 installer-common
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to