From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Fri, 12 Oct 2012 07:55:07 +0000 (+0200)
Subject: Install the wood textures as png
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=5234409d87b0b67a528acb623af316d8462899de;p=xboard.git

Install the wood textures as png

The xboard.conf has to be edited to set these as default textures,
in stead of the .xpm files.
---

diff --git a/Makefile.am b/Makefile.am
index 3d1865d..c57d1af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -190,12 +190,12 @@ dist_svg_DATA = svg/icon_white.svg         svg/icon_black.svg      \
 ### directory and files for pixmaps
 
 pixmapsdir = $(datadir)/games/xboard/pixmaps/textures
-dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm
+dist_pixmaps_DATA = pixmaps/cross32.xpm pixmaps/cross48.xpm pixmaps/board32.xpm pixmaps/board48.xpm
 
 ### directory and files for pngs
 
 pngdir = $(datadir)/games/xboard/themes/textures
-dist_png_DATA = png/hatch.png
+dist_png_DATA = png/hatch.png png/wood_d.png png/wood_l.png
 
 ### directory and files for sound files
 
@@ -207,7 +207,7 @@ dist_sounds_DATA = \
 
 ### set correct dir in xboard.conf
 
-edit = sed -e 's|@pixmapsdir[@]|$(pixmapsdir)|g' \
+edit = sed -e 's|@pngdir[@]|$(pngdir)|g' \
            -e 's|@soundsdir[@]|$(soundsdir)|g'
 
 xboard.conf: Makefile $(srcdir)/xboard.conf.in
diff --git a/xboard.conf.in b/xboard.conf.in
index 070091c..0e94d2c 100644
--- a/xboard.conf.in
+++ b/xboard.conf.in
@@ -23,8 +23,8 @@
 -flashRate 5
 -fontSizeTolerance 4
 -useBoardTexture true
--liteBackTextureFile  "@pixmapsdir@/wood_l.xpm"
--darkBackTextureFile  "@pixmapsdir@/wood_d.xpm"
+-liteBackTextureFile  "@pngdir@/wood_l.png"
+-darkBackTextureFile  "@pngdir@/wood_d.png"
 -overrideLineGap 1
 -highlightMoveWithArrow true
 -recentEngines 4