From 1ec89588666a1e1a371d1c4c84fa53099af9dbf3 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 30 Oct 2003 21:05:43 +0000 Subject: [PATCH] - 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 | 4 ++++ xqf/configure.in | 3 --- xqf/src/Makefile.am | 11 ++++++++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/xqf/ChangeLog b/xqf/ChangeLog index 9d1af32..3a258d6 100644 --- a/xqf/ChangeLog +++ b/xqf/ChangeLog @@ -1,3 +1,7 @@ +Oct 30, 2003: Ludwig Nussel +- move definition of PACKAGE_DATA_DIR to Makefile.am as recommended in autoconf + docu + Oct 29, 2003: Ludwig Nussel - additional gametypes for RTCW and ET mods. Thanks Ben Winslow for the patch diff --git a/xqf/configure.in b/xqf/configure.in index d40a13b..b534112 100644 --- a/xqf/configure.in +++ b/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 diff --git a/xqf/src/Makefile.am b/xqf/src/Makefile.am index 59abf40..7352e17 100644 --- a/xqf/src/Makefile.am +++ b/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