H.G.Muller's patch to avoid collisions with built-in OSX text

[xboard.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 80ece5f..09fa6fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,7 +189,7 @@ dist_pixmaps_DATA = pixmaps/cross32.png pixmaps/cross48.png pixmaps/board32.png
 ### directory and files for pngs
 
 pngdir = $(gamedatadir)/themes/textures
-dist_png_DATA = png/hatch.png png/wood_d.png png/wood_l.png png/xqboard.png
+dist_png_DATA = png/hatch.png png/wood_d.png png/wood_l.png png/xqboard-9x10.png
 
 ### directory and files for sound files
 
@@ -306,10 +306,12 @@ macportsprefix = $(shell which port | sed s/[/]bin[/]port//)
        cp $(macportsprefix)/share/gtk-engines/murrine.xml $(datadir)/gtk-engines/murrine.xml
        $(INSTALL) ./png/marble_d.png $(gamedatadir)/themes/textures
        $(INSTALL) ./png/marble_l.png $(gamedatadir)/themes/textures
-       $(INSTALL) ./png/xqwood.png $(gamedatadir)/themes/textures
+       $(INSTALL) ./png/xqwood-9x10.png $(gamedatadir)/themes/textures
        cp -R ./osxapp/logos $(gamedatadir)/
+if NLS_ENABLED
        cp -R $(macportsprefix)/share/strings/. $(datarootdir)/
        for i in po/*gmo; do lang=`basename $$i .gmo`; $(INSTALL) $(macportsprefix)/share/locale/$$lang/LC_MESSAGES/gtk20.mo $(localedir)/$$lang/LC_MESSAGES/; done
+endif
        dylibbundler -of -b -x $(bindir)/xboard-bin -d $(datarootdir)/lib -p @executable_path/../Resources/lib
        dylibbundler -of -b -x $(datarootdir)/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
        dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/immodules/im-quartz.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib