replace hard coded paths with path from configure script

use $datadir and subdirectories to store some data files. Also make files in xboard.conf use correct path.

diff --git a/Makefile.am b/Makefile.am
index 8901a08..a3fe40d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+### if we are compiling with ZIPPY we need some extra source files
 
 if ZIPPY
   ZPY = zippy.c zippy.h
@@ -38,22 +39,51 @@ EXTRA_DIST = pixmaps bitmaps winboard sounds filebrowser/README \
 
 DISTCLEANFILES = stamp-h
 
-AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"'
+AM_CPPFLAGS=-DINFODIR='"$(infodir)"' @X_CFLAGS@  -DSYSCONFDIR='"$(sysconfdir)"' -DBITMAPDIR='"$(datadir)/games/xboard/bitmaps/"'
 
 info_TEXINFOS =  xboard.texi
 xboard_TEXINFOS =  copyright.texi 
 man6_MANS = xboard.man
 
+
+### config file
+
 dist_sysconf_DATA = xboard.conf
 
+
+### icon files
+
 icondir = $(datadir)/icons/hicolor/48x48/apps
 dist_icon_DATA = xboard.png
 svgicondir = $(datadir)/icons/hicolor/scalable/apps
 dist_svgicon_DATA = xboard.svg
 
+
+### desktop files for KDE and gnome
+
 Applicationsdir = $(datadir)/applications
 Applications_DATA = xboard.desktop
 
 
+### directory and files to be used as bitmaps
+
+bitmapdir = $(datadir)/games/xboard/
+dist_bitmap_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm
+
+
+### set correct dir in xboard.conf
+
+edit = sed -e 's|@bitmapdir[@]|$(bitmapdir)|g'
+
+xboard.conf: Makefile $(srcdir)/xboard.conf.in
+       rm -f $@ $@.tmp
+       srcdir=''
+       test -f ./$@.in || srcdir=$(srcdir)/;
+       $(edit) $${srcdir}$@.in >$@.tmp
+       mv $@.tmp $@
+
+
+### the man page depends on several files, so we add a special rule
+
 xboard.man: xboard.texi copyright.texi gpl.texinfo version.texi
        $(srcdir)/texi2man $(srcdir)/xboard.texi > xboard.man || (rm -f xboard.man ; false)

diff --git a/common.h b/common.h
index 322bd66..cf16a68 100644 (file)
--- a/common.h
+++ b/common.h
@@ -154,7 +154,7 @@ int pclose(FILE *);
 #define FIRST_HOST             "localhost"
 #define SECOND_HOST            "localhost"
 #define TELNET_PROGRAM          "telnet"
-#define DEF_BITMAP_DIR          "/usr/share/games/xboard/bitmaps.xchess" /* AP: shouldn't be hardcoded directory, but better than nothing at the moment */
+#define DEF_BITMAP_DIR          BITMAPDIR
 #define MATCH_MODE             "False"
 #define INIT_STRING            "new\nrandom\n"
 #define WHITE_STRING           "white\ngo\n"

diff --git a/configure.ac b/configure.ac
index 9bcedb8..9273e45 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -437,6 +437,7 @@ echo ""
 echo "        prefix:          $prefix       "
 echo "        datarootdir:     $datarootdir  "
 echo "        datadir:         $datadir   (icons will go in \$datadir/icons/hicolor/...)"
+echo "                                    (bitmaps will go in \$datadir/games/xboard/...)"
 echo "        infodir:         $infodir   (info files will go here)"
 echo "        sysconfdir:      $sysconfdir   (xboard.conf will go here)"
 echo ""

diff --git a/xboard.conf b/xboard.conf.in
similarity index 94%
rename from xboard.conf
rename to xboard.conf.in
index 6d06360..607a1e9 100644 (file)
--- a/xboard.conf
+++ b/xboard.conf.in
@@ -24,8 +24,8 @@
 -fontSizeTolerance 4
 -pixmapDirectory ""
 -bitmapDirectory ""
--liteBackTextureFile "/usr/share/games/xboard/wood_l.xpm"
--darkBackTextureFile "/usr/share/games/xboard/wood_d.xpm"
+-liteBackTextureFile  "@bitmapdir@wood_l.xpm"
+-darkBackTextureFile  "@bitmapdir@wood_d.xpm"
 -overrideLineGap 0
 -highlightMoveWithArrow true
 ;