From 28655eb97418768b1ed6fa01b16d8b7eec60acaf Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sun, 20 Feb 2022 01:27:45 +0200 Subject: [PATCH 15/15] Msys2: Move langstat creation after the repo modification check As langstat creation does modify files, the --enable-gitrev build was always flagged as "modified" in the version string. See osdn #43891 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 45df254ab5..ebd8832ae4 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -86,11 +86,11 @@ configure-freeciv-ruledit: # install Freeciv install-freeciv-common: configure-freeciv-common - # make langstat files - make -C build-$(WINARCH)-$(GUI)/translations/core update-po - make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt # make install make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(GUI) $(MAKE_PARAMS) install + # make langstat files. This update-po must be after fc_gitrev_gen.h generation. + make -C build-$(WINARCH)-$(GUI)/translations/core update-po + make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt # reorder directory layout mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/bin/* install-$(WINARCH)-$(GUI)/ mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/etc install-$(WINARCH)-$(GUI)/ @@ -124,11 +124,11 @@ install-ruledit-dir: mkdir -p install-$(WINARCH)-ruledit/share install-ruledit: configure-freeciv-ruledit install-ruledit-dir - # make langstat files - make -C build-$(WINARCH)-ruledit/translations/ruledit update-po - make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt # make install make -C build-$(WINARCH)-ruledit DESTDIR=`pwd`/install-$(WINARCH)-ruledit/ $(MAKE_PARAMS) install + # make langstat files. This update-po must be after fc_gitrev_gen.h generation. + make -C build-$(WINARCH)-ruledit/translations/ruledit update-po + make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt # reorder directory layout mv install-$(WINARCH)-ruledit/$(INSTSUB)/bin/* install-$(WINARCH)-ruledit/ mv install-$(WINARCH)-ruledit/$(INSTSUB)/share/freeciv install-$(WINARCH)-ruledit/data -- 2.34.1