X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=Makefile.am;h=a3051ba924b469f171357ca1d6b579a3a87fe17a;hp=f465cb41075256833cb618bdc6746c66e148ef70;hb=c0bcf53dc4abc3fc4001252c734b926765598837;hpb=530ea490637c32ac84f5f8daf9df98c5843deb58

diff --git a/Makefile.am b/Makefile.am
index f465cb4..a3051ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -70,7 +70,7 @@ DISTCLEANFILES = stamp-h
 GITVERSION=$(shell sh -c 'git describe --dirty --always 2>/dev/null')
 AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@ @CAIRO_CFLAGS@ @FRONTEND_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' \
 	    -DLOCALEDIR='"$(localedir)"' -DSVGDIR='"$(svgdir)"' -D__GIT_VERSION='"$(GITVERSION)"' \
-            -DCONFIGURE_OPTIONS='"@CONFIGURE_OPTIONS@"' -DDATADIR='"$(datadir)/games/xboard"' $(headers)
+            -DCONFIGURE_OPTIONS='"@CONFIGURE_OPTIONS@"' -DDATADIR='"$(datadir)/games/xboard"' -DMANDIR='"$(mandir)"' $(headers)
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -145,6 +145,27 @@ dist_svg_DATA = svg/icon_white.svg         svg/icon_black.svg      \
            svg/BlackHCrown.svg	    svg/WhiteHCrown.svg       \
            svg/BlackDolphin.svg	    svg/WhiteDolphin.svg      \
            svg/BlackClaw.svg	    svg/WhiteClaw.svg         \
+           svg/BlackWolf.svg	    svg/WhiteWolf.svg         \
+           svg/BlackCamel.svg	    svg/WhiteCamel.svg        \
+           svg/BlackZebra.svg	    svg/WhiteZebra.svg        \
+           svg/BlackGnu.svg	    svg/WhiteGnu.svg          \
+           svg/BlackWizard.svg	    svg/WhiteWizard.svg       \
+           svg/BlackViking.svg	    svg/WhiteViking.svg       \
+           svg/BlackIron.svg	    svg/WhiteIron.svg         \
+           svg/BlackCopper.svg	    svg/WhiteCopper.svg       \
+           svg/BlackTower.svg	    svg/WhiteTower.svg        \
+           svg/BlackDragon.svg	    svg/WhiteDragon.svg       \
+           svg/BlackCub.svg	    svg/WhiteCub.svg          \
+           svg/BlackButterfly.svg   svg/WhiteButterfly.svg    \
+           svg/BlackLeft.svg	    svg/WhiteLeft.svg         \
+           svg/BlackRight.svg	    svg/WhiteRight.svg        \
+           svg/BlackHat.svg	    svg/WhiteHat.svg          \
+           svg/BlackRShield.svg	    svg/WhiteRShield.svg      \
+           svg/BlackLShield.svg	    svg/WhiteLShield.svg      \
+           svg/BlackAxe.svg	    svg/WhiteAxe.svg          \
+           svg/BlackFlag.svg	    svg/WhiteFlag.svg         \
+           svg/BlackDuck.svg	    svg/WhiteDuck.svg         \
+           svg/BlackPegasus.svg	    svg/WhitePegasus.svg      \
            svg/eo_Analyzing.svg     svg/eo_Black.svg          \
            svg/eo_Clear.svg         svg/eo_Ponder.svg         \
            svg/eo_Thinking.svg      svg/eo_Unknown.svg        \
@@ -189,7 +210,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
 
@@ -244,11 +265,12 @@ endif
 
 if OSX_APP
 osxapp: all-recursive install install-recursive
+macportsprefix = $(shell which port | sed s/[/]bin[/]port//)
 	$(MKDIR_P) $(datarootdir)/bin
 	$(MKDIR_P) $(datarootdir)/lib
 	$(MKDIR_P) $(sysconfdir)/gtk-2.0
-	$(MKDIR_P) $(sysconfdir)/pango
 	$(MKDIR_P) $(datadir)/themes
+	$(MKDIR_P) $(datadir)/gtk-engines
 	$(MKDIR_P) $(gamedatadir)/themes
 	$(INSTALL) ./osxapp/Info.plist $(prefix)
 	$(INSTALL) ./osxapp/PkgInfo $(prefix)
@@ -288,34 +310,31 @@ osxapp: all-recursive install install-recursive
 	echo '-saveSettingsFile "~/Library/Preferences/XBoard.conf"' >>$(sysconfdir)/xboard.conf
 	echo '-settingsFile "~/Library/Preferences/XBoard.conf"' >>$(sysconfdir)/xboard.conf
 
-	sed 's?/opt/local/lib?/tmp/skl/XBoard.app/Contents/Resources/lib?' </opt/local/etc/gtk-2.0/gdk-pixbuf.loaders >$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
-	sed -e 's?/opt/local/lib?/tmp/skl/XBoard.app/Contents/Resources/lib?' -e 's?/opt/local/share/locale?/tmp/skl/XBoard.app/Contents/Resources/share/locale?' </opt/local/etc/gtk-2.0/gtk.immodules >$(sysconfdir)/gtk-2.0/gtk.immodules
+	sed 's?$(macportsprefix)/lib?/tmp/skl/XBoard.app/Contents/Resources/lib?' <$(macportsprefix)/etc/gtk-2.0/gdk-pixbuf.loaders >$(sysconfdir)/gtk-2.0/gdk-pixbuf.loaders
+	sed -e 's?$(macportsprefix)/lib?/tmp/skl/XBoard.app/Contents/Resources/lib?' -e 's?$(macportsprefix)/share/locale?/tmp/skl/XBoard.app/Contents/Resources/share/locale?' <$(macportsprefix)/etc/gtk-2.0/gtk.immodules >$(sysconfdir)/gtk-2.0/gtk.immodules
 	$(INSTALL) ./osxapp/launcher_rc $(datarootdir)/
-	$(INSTALL) /opt/local/etc/gtk-2.0/im-multipress.conf $(sysconfdir)/gtk-2.0
+	$(INSTALL) $(macportsprefix)/etc/gtk-2.0/im-multipress.conf $(sysconfdir)/gtk-2.0
 	$(INSTALL) ./osxapp/gtkrc $(sysconfdir)/gtk-2.0/gtkrc
-	sed -e '/ModuleFiles = \/opt\/local\/etc\/pango\/pango.modules/d' </opt/local/etc/pango/pangorc >$(sysconfdir)/pango/pangorc
-	sed -e 's?/opt/local/lib/pango/1.8.0/modules/??' </opt/local/etc/pango/pango.modules >$(sysconfdir)/pango/pango.modules
-	cp -R /opt/local/lib/gtk-2.0 $(datarootdir)/lib
-	cp -R /opt/local/lib/gdk-pixbuf-2.0 $(datarootdir)/lib
-	cp -R /opt/local/lib/pango $(datarootdir)/lib
-	cp -R /opt/local/share/themes/Mac $(datadir)/themes
-	cp -R ./osxapp/default/. $(gamedatadir)/themes/default
+	cp -R $(macportsprefix)/lib/gtk-2.0 $(datarootdir)/lib
+	cp -R $(macportsprefix)/lib/gdk-pixbuf-2.0 $(datarootdir)/lib
+	cp -R $(macportsprefix)/share/themes/Mac $(datadir)/themes
+	cp -R ./osxapp/gtk2-themes/Mac/gtk-2.0 $(datadir)/themes/Mac
+	cp -R ./osxapp/themes/default/. $(gamedatadir)/themes/default
+	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)/
-	cp -R ./osxapp/osx-localization/. $(datarootdir)/
-	for i in po/*gmo; do lang=`basename $$i .gmo`; $(INSTALL) /opt/local/share/locale/$$lang/LC_MESSAGES/gtk20.mo $(localedir)/$$lang/LC_MESSAGES/; done
+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
 	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libpixmap.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
-	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-arabic-lang.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
-	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-coretext.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
-	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-basic-fc.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
-	dylibbundler -of -b -x $(datarootdir)/lib/pango/1.8.0/modules/pango-indic-lang.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
+	dylibbundler -of -b -x $(datarootdir)/lib/gtk-2.0/2.10.0/engines/libmurrine.so -d $(datarootdir)/lib -p @executable_path/../Resources/lib
 	find ./XBoard.app -name '*.a' -print0 | xargs -0 rm
-	find ./XBoard.app -name '*.la' -print0 | xargs -0 rm
 	rm -r $(datarootdir)/lib/gtk-2.0/include
 	rm -r $(datarootdir)/share/applications
 	rm $(datarootdir)/share/info/dir