From 2f099561a576f7e85981bffcd6b6dc6b57f596f1 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 19 Mar 2022 08:54:20 +0200 Subject: [PATCH 20/20] Msys2: Make sure that up-to-date translations are used See osdn #44143 Signed-off-by: Marko Lindqvist --- windows/installer_msys2/Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/windows/installer_msys2/Makefile b/windows/installer_msys2/Makefile index 90a2892ac2..b4c6c7878e 100644 --- a/windows/installer_msys2/Makefile +++ b/windows/installer_msys2/Makefile @@ -86,11 +86,14 @@ configure-freeciv-ruledit: # install Freeciv install-freeciv-common: configure-freeciv-common - # 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 .gmo and langstat files. For the former, this needs to be before 'make install' make -C build-$(WINARCH)-$(GUI)/translations/core update-po make -C build-$(WINARCH)-$(GUI)/bootstrap langstat_core.txt + # Restore .po files modified by the above update-po, so that repository does not + # appear modified, in case of --enable-gitrev + ./cleanup_checkout.sh ../.. + # make install + make -C build-$(WINARCH)-$(GUI) DESTDIR=`pwd`/install-$(WINARCH)-$(GUI) $(MAKE_PARAMS) install # reorder directory layout mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/bin/* install-$(WINARCH)-$(GUI)/ mv install-$(WINARCH)-$(GUI)/$(INSTSUB)/etc install-$(WINARCH)-$(GUI)/ @@ -124,11 +127,14 @@ install-ruledit-dir: mkdir -p install-$(WINARCH)-ruledit/share install-ruledit: configure-freeciv-ruledit install-ruledit-dir - # 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 .gmo and langstat files. For the former, this needs to be before 'make install' make -C build-$(WINARCH)-ruledit/translations/ruledit update-po make -C build-$(WINARCH)-ruledit/bootstrap langstat_ruledit.txt + # Restore .po files modified by the above update-po, so that repository does not + # appear modified, in case of --enable-gitrev + ./cleanup_checkout.sh ../.. + # make install + make -C build-$(WINARCH)-ruledit DESTDIR=`pwd`/install-$(WINARCH)-ruledit/ $(MAKE_PARAMS) install # reorder directory layout mv install-$(WINARCH)-ruledit/$(INSTSUB)/bin/* install-$(WINARCH)-ruledit/ mv install-$(WINARCH)-ruledit/$(INSTSUB)/share/freeciv install-$(WINARCH)-ruledit/data -- 2.35.1