- move definition of PACKAGE_DATA_DIR to Makefile.am as recommended in autoconf

docu


git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@540 d2ac09be-c843-0410-8b1f-f8a84130e0ec

xqf/ChangeLog

@@ -1,3 +1,7 @@
+Oct 30, 2003: Ludwig Nussel <l-n@users.sourceforge.net>
+- move definition of PACKAGE_DATA_DIR to Makefile.am as recommended in autoconf
+  docu
+
 Oct 29, 2003: Ludwig Nussel <l-n@users.sourceforge.net>
 - additional gametypes for RTCW and ET mods. Thanks Ben Winslow for
   the patch

xqf/configure.in

@@ -184,9 +184,6 @@ else
 	AC_MSG_RESULT([no])
 fi
 
-xqf_pkgdata=`eval echo ${datadir}/${PACKAGE}`
-AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, ["${xqf_pkgdata}"], Architecture independent data files)
-
 AC_CONFIG_FILES([
 	Makefile
 	src/Makefile

xqf/src/Makefile.am

@@ -1,7 +1,16 @@
 SUBDIRS = xpm zip
 
 localedir = $(datadir)/locale
-INCLUDES = -I$(top_srcdir)/intl -DLOCALEDIR=\"$(localedir)\" $(GTK_CFLAGS) @QSTAT23@ @DEBUG@ @COMPRESSION@ $(GDK_PIXBUF_CFLAGS) @PACKAGE_CFLAGS@ $(OLD_GTK_SUPPORT)
+INCLUDES = -I$(top_srcdir)/intl \
+	-DLOCALEDIR=\"$(localedir)\" \
+	-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+	$(GTK_CFLAGS) \
+	$(QSTAT23) \
+	$(DEBUG) \
+	$(COMPRESSION) \
+	$(GDK_PIXBUF_CFLAGS) \
+	$(PACKAGE_CFLAGS) \
+	$(OLD_GTK_SUPPORT)
 
 qstatcfgdir = $(pkgdatadir)
 qstatcfg_DATA = qstat.cfg