From: Arun Persaud <apersaud@lbl.gov>
Date: Sat, 16 Apr 2011 16:54:26 +0000 (-0700)
Subject: configure: renamed bitmapdir to pixmapsdir, since it installed only pixmaps. also... 
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=29cdb3df264381034a99c132554295d4e4deb1e6;hp=1c36ced6dd39e157e3e94e24c253a93be9f8f4ed;p=xboard.git

configure: renamed bitmapdir to pixmapsdir, since it installed only pixmaps. also changed name of default dir

pixmaps will now be installed under .../games/xboard/pixmaps/default/
---

diff --git a/Makefile.am b/Makefile.am
index a30157b..f9b6398 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,15 +66,15 @@ Applicationsdir = $(datadir)/applications
 Applications_DATA = xboard.desktop
 
 
-### directory and files to be used as bitmaps
+### directory and files for pixmaps
 
-bitmapdir = $(datadir)/games/xboard
-dist_bitmap_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
+pixmapsdir = $(datadir)/games/xboard/pixmaps/default
+dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
 
 
 ### set correct dir in xboard.conf
 
-edit = sed -e 's|@bitmapdir[@]|$(bitmapdir)|g'
+edit = sed -e 's|@pixmapsdir[@]|$(pixmapsdir)|g'
 
 xboard.conf: Makefile $(srcdir)/xboard.conf.in
 	@echo '  'GEN '  ' $@;
diff --git a/xboard.conf.in b/xboard.conf.in
index 590f5a5..934e47f 100644
--- a/xboard.conf.in
+++ b/xboard.conf.in
@@ -24,15 +24,15 @@
 -fontSizeTolerance 4
 -pixmapDirectory ""
 -bitmapDirectory ""
--liteBackTextureFile  "@bitmapdir@/wood_l.xpm"
--darkBackTextureFile  "@bitmapdir@/wood_d.xpm"
+-liteBackTextureFile  "@pixmapsdir@/wood_l.xpm"
+-darkBackTextureFile  "@pixmapsdir@/wood_d.xpm"
 -overrideLineGap 1
 -highlightMoveWithArrow true
 ;
 ; Behavior
 ;
 -soundProgram "aplay -q"
--soundDirectory @bitmapdir@/sounds
+-soundDirectory "@pixmapsdir@/sounds"
 -pasteSelection false
 -keepLineBreaksICS false
 -timeDelay 1