Author: cazfi Date: Fri Jul 8 07:56:54 2016 New Revision: 33202 URL: http://svn.gna.org/viewcvs/freeciv?rev=33202&view=rev Log: Include user EXTRA_CONFIG for ruledit installer build.
See patch #7383 Modified: trunk/win32/installer/Makefile trunk/win32/installer_msys2/Makefile Modified: trunk/win32/installer/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=33202&r1=33201&r2=33202&view=diff ============================================================================== --- trunk/win32/installer/Makefile (original) +++ trunk/win32/installer/Makefile Fri Jul 8 07:56:54 2016 @@ -71,7 +71,7 @@ # create build directory mkdir -p build-ruledit # configure - cd build-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --enable-ruledit + cd build-ruledit; ../../../configure CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --enable-ruledit $(EXTRA_CONFIG) # make make -C build-ruledit make -C build-ruledit/translations/ruledit update-po Modified: trunk/win32/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=33202&r1=33201&r2=33202&view=diff ============================================================================== --- trunk/win32/installer_msys2/Makefile (original) +++ trunk/win32/installer_msys2/Makefile Fri Jul 8 07:56:54 2016 @@ -85,7 +85,7 @@ # create build directory mkdir -p build-$(WINARCH)-ruledit # configure - cd build-$(WINARCH)-ruledit; ../../../configure FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-project-definition=../../../bootstrap/snapshot.project --without-libbz2 --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --enable-ruledit --with-qt5-includes=$(ARCHDIR)/include --with-qt5-libs=$(ARCHDIR)/lib + cd build-$(WINARCH)-ruledit; ../../../configure FREECIV_LABEL_FORCE="<base>-msys2" CPPFLAGS="-D_WIN32_WINNT=$(MIN_WIN_VER)" --with-project-definition=../../../bootstrap/snapshot.project --without-libbz2 --disable-client --disable-server --disable-fcmp --disable-freeciv-manual --enable-ruledit --with-qt5-includes=$(ARCHDIR)/include --with-qt5-libs=$(ARCHDIR)/lib $(EXTRA_CONFIG) # make make -C build-$(WINARCH)-ruledit make -C build-$(WINARCH)-ruledit/translations/ruledit update-po _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits