Author: cazfi
Date: Sun Aug 28 12:45:59 2016
New Revision: 33716
URL: http://svn.gna.org/viewcvs/freeciv?rev=33716&view=rev
Log:
Use arch-specific nsi file names when building msys2 based Windows Installers.
See patch #7658
Modified:
trunk/windows/installer_msys2/Makefile
Modified: trunk/windows/installer_msys2/Makefile
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=33716&r1=33715&r2=33716&view=diff
==============================================================================
--- trunk/windows/installer_msys2/Makefile (original)
+++ trunk/windows/installer_msys2/Makefile Sun Aug 28 12:45:59 2016
@@ -347,19 +347,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-gtk3x: build-freeciv-gtk3x installer-common
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
