From: Arun Persaud <arun@nubati.net>
Date: Sun, 12 Oct 2014 17:09:51 +0000 (-0700)
Subject: replaced hardcoded pngdir with built-in ~~
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=50bc241d1d9c026d128eb29c7f3bdc2ba5525c46;p=xboard.git

replaced hardcoded pngdir with built-in ~~

don't need to create xboard.conf from xboard.conf.in anymore
---

diff --git a/Makefile.am b/Makefile.am
index 847084a..5316962 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST = pixmaps themes png sounds winboard \
 	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop xboard-config.desktop \
 	xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
 	COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm zippy.README \
-	xboard.conf.in SHORTLOG DIFFSTAT history.c ABOUT-NLS $(FRONTENDextras)
+	xboard.conf SHORTLOG DIFFSTAT history.c ABOUT-NLS $(FRONTENDextras)
 
 DISTCLEANFILES = stamp-h
 
@@ -198,21 +198,6 @@ dist_sounds_DATA = \
   sounds/cymbal.wav     sounds/pop2.wav   sounds/slap.wav     sounds/ding1.wav      sounds/laser.wav \
   sounds/woodthunk.wav  sounds/gong.wav   sounds/penalty.wav  sounds/honkhonk.wav   sounds/phone.wav  sounds/roar.wav
 
-
-### set correct dir in xboard.conf
-
-edit = sed -e 's|@pngdir[@]|$(pngdir)|g' \
-           -e 's|@soundsdir[@]|$(soundsdir)|g'
-
-xboard.conf: Makefile $(srcdir)/xboard.conf.in
-	@echo '  'GEN '  ' $@;
-	@rm -f $@ $@.tmp
-	@$(edit) $(srcdir)/$@.in >$@.tmp
-	@mv $@.tmp $@
-
-distclean-local:
-	-rm -f xboard.conf
-
 ### the man page depends on several files, so we add a special rule
 
 xboard.man: xboard.texi copyright.texi gpl.texinfo version.texi
diff --git a/xboard.conf.in b/xboard.conf
similarity index 96%
rename from xboard.conf.in
rename to xboard.conf
index 56e5f84..6c43b97 100644
--- a/xboard.conf.in
+++ b/xboard.conf
@@ -24,8 +24,8 @@
 -flashRate 5
 -fontSizeTolerance 4
 -useBoardTexture true
--liteBackTextureFile  "@pngdir@/wood_l.png"
--darkBackTextureFile  "@pngdir@/wood_d.png"
+-liteBackTextureFile  "~~/themes/textures/wood_l.png"
+-darkBackTextureFile  "~~/themes/textures/wood_d.png"
 -overrideLineGap 1
 -highlightMoveWithArrow true
 -recentEngines 4
@@ -42,7 +42,7 @@
 -showTargetSquares true
 -seekGraph true
 -soundProgram "aplay -q"
--soundDirectory "@soundsdir@"
+-soundDirectory "~~/sounds"
 -soundTell phone.wav
 -soundChallenge gong.wav
 -soundMove woodthunk.wav