Author: cazfi
Date: Sun Feb 21 12:44:59 2016
New Revision: 31997

URL: http://svn.gna.org/viewcvs/freeciv?rev=31997&view=rev
Log:
Disabled nls from msys2 based installer builds.

See patch #6974

Modified:
    trunk/win32/installer_msys2/Makefile

Modified: trunk/win32/installer_msys2/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer_msys2/Makefile?rev=31997&r1=31996&r2=31997&view=diff
==============================================================================
--- trunk/win32/installer_msys2/Makefile        (original)
+++ trunk/win32/installer_msys2/Makefile        Sun Feb 21 12:44:59 2016
@@ -59,7 +59,7 @@
        # create build directory
        mkdir -p build-$(WINARCH)-$(GUI)
        # configure
-       cd build-$(WINARCH)-$(GUI); ../../../configure 
CPPFLAGS="-D_WIN32_WINNT=0x0600" --enable-client=$(GUI) 
--with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --without-readline 
--disable-sdl-mixer --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
+       cd build-$(WINARCH)-$(GUI); ../../../configure 
CPPFLAGS="-D_WIN32_WINNT=0x0600" --enable-client=$(GUI) 
--with-followtag="win32-S3_0" --enable-fcdb=sqlite3 --without-readline 
--disable-sdl-mixer --disable-nls --enable-fcmp=$(FCMP) $(EXTRA_CONFIG)
        # make
        make -C build-$(WINARCH)-$(GUI)
        make -C build-$(WINARCH)-$(GUI)/translations/freeciv update-po
@@ -95,7 +95,6 @@
        mv install-$(WINARCH)-$(GUI)/usr/local/etc install-$(WINARCH)-$(GUI)/
        mv install-$(WINARCH)-$(GUI)/usr/local/share/freeciv 
install-$(WINARCH)-$(GUI)/data
        mkdir -p install-$(WINARCH)-$(GUI)/share
-       mv install-$(WINARCH)-$(GUI)/usr/local/share/locale 
install-$(WINARCH)-$(GUI)/share/
        mv install-$(WINARCH)-$(GUI)/usr/local/share/doc 
install-$(WINARCH)-$(GUI)/doc
        mkdir -p install-$(WINARCH)-$(GUI)/debuginfo
        cp build-$(WINARCH)-$(GUI)/gen_headers/fc_config.h 
install-$(WINARCH)-$(GUI)/debuginfo
@@ -230,8 +229,6 @@
        cp -R $(ARCHDIR)/etc/gtk-3.0 install-$(WINARCH)-$(GUI)/etc/
        mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
        cp -R $(ARCHDIR)/lib/gtk-3.0/* install-$(WINARCH)-$(GUI)/lib/gtk-3.0/
-       cp -R /share/locale install-$(WINARCH)-$(GUI)/share/
-       find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -and -not -name gtk30.mo -delete
 
 install-env-gtk3x: install-env-default-fcmp
 
@@ -249,8 +246,6 @@
        cp -R /etc/gtk-2.0 install-$(WINARCH)-$(GUI)/etc/
        mkdir -p install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
        cp -R /lib/gtk-2.0/2.10.0 install-$(WINARCH)-$(GUI)/lib/gtk-2.0/
-       cp -R /share/locale install-$(WINARCH)-$(GUI)/share/
-       find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -and -not -name gtk20.mo -delete
 
 SDL2_DLLS := \
        libpng12-0.dll \
@@ -283,8 +278,6 @@
        cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-$(GUI)
        # add additional Qt files
        cp -R $(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/
-       cp -R /share/locale install-$(WINARCH)-$(GUI)/share/
-       find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name 
"freeciv*.mo" -delete
 
 # TODO: Clean out unnecessary ones. These are just copies of COMMON_DLLS and
 #       COMMON_MSYS_DLLS with most obviously unnecessary things left out.


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

Reply via email to