diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2005-02-04 00:29:37 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2005-02-04 00:29:37 +0000 |
| commit | 02f8788b4ebb369ef7aabf9e75af37c614cf69a3 (patch) | |
| tree | 560281d7fc7b4722c3c38376083c9cf5c3d6a8d9 | |
| parent | d01c1ddaef96ff37817227ee34c143c6f9b29152 (diff) | |
Albert Chin:
>From autoconf.info:
In order to support these features, it is essential that `datadir'
remains being defined as `${prefix}/share' to depend upon the current
value of `prefix'.
A corollary is that you should not use these variables except in
Makefiles. For instance, instead of trying to evaluate `datadir' in
`configure' and hard-coding it in Makefiles using e.g.,
`AC_DEFINE_UNQUOTED(DATADIR, "$datadir")', you should add
`-DDATADIR="$(datadir)"' to your `CPPFLAGS'.
svn path=/trunk/; revision=13275
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/configure.in b/configure.in index b51b4e171f..f417af6f82 100644 --- a/configure.in +++ b/configure.in @@ -318,15 +318,6 @@ else AC_MSG_RESULT(no) fi -# Create DATAFILE_DIR #define for config.h -datafiledir=$datadir/ethereal -datafiledir=`( - test "x$prefix" = xNONE && prefix=$ac_default_prefix - test "x$exec_prefix" = xNONE && exec_prefix=${prefix} - eval echo "$datafiledir" -)` -AC_DEFINE_UNQUOTED(DATAFILE_DIR,"$datafiledir", [Directory for data]) - # GTK checks # We don't add $GLIB_LIBS to LIBS, because we don't want to force all # programs to be built with GTK+. diff --git a/epan/Makefile.am b/epan/Makefile.am index 1214e92a70..849c0e28b1 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -34,7 +34,7 @@ libethereal_la_LDFLAGS = -version-info 0:1:0 include Makefile.common -INCLUDES = -I$(srcdir)/.. +AM_CPPFLAGS = -I$(srcdir)/.. -DDATAFILE_DIR=\"$(datadir)\" libethereal_la_SOURCES = \ $(LIBETHEREAL_SRC) \ |