Author: cazfi
Date: Thu Feb 25 11:01:55 2016
New Revision: 32082

URL: http://svn.gna.org/viewcvs/freeciv?rev=32082&view=rev
Log:
In msys2 Installer build Makefile, target 'snapshot' wraps further make call
through target that is not specific to a target, since at the time 'snapshot'
target runs intself, arch information is not reliable.

See bug #24443

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=32082&r1=32081&r2=32082&view=diff
==============================================================================
--- branches/S2_6/win32/installer_msys2/Makefile        (original)
+++ branches/S2_6/win32/installer_msys2/Makefile        Thu Feb 25 11:01:55 2016
@@ -32,6 +32,9 @@
 
 buildable-win64:
 
+# See comments on 'snapshot' target why this wrapping is needed
+buildable: buildable-$(WINARCH)
+
 gtk3-installer:
        make GUI=gtk3 FCMP=gtk3 EXTRA_CONFIG="--disable-ruledit 
$(EXTRA_CONFIG)" wrap-gtk3
 
@@ -47,9 +50,13 @@
 ruledit-installer:
        make wrap-ruledit
 
+# Autogen.sh here will make ./win_arch.sh to work.
+# The $(WINACRH) value we got for this run is not good. The new run
+# launched from this target will pick correct value, and can make 'buildable' 
target
+# to depend on correct arch version.
 snapshot:
        cd ../.. ; ./autogen.sh --no-configure-run
-       make VERSION_REVTYPE="svn" EXTRA_CONFIG="--enable-svnrev" 
buildable-$(WINARCH)
+       make VERSION_REVTYPE="svn" EXTRA_CONFIG="--enable-svnrev" buildable
 
 
 # build Freeciv


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

Reply via email to