diff options
| -rw-r--r-- | configure.in | 9 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.in b/configure.in index f417af6f82..b51b4e171f 100644 --- a/configure.in +++ b/configure.in @@ -318,6 +318,15 @@ 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 849c0e28b1..1214e92a70 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -34,7 +34,7 @@ libethereal_la_LDFLAGS = -version-info 0:1:0 include Makefile.common -AM_CPPFLAGS = -I$(srcdir)/.. -DDATAFILE_DIR=\"$(datadir)\" +INCLUDES = -I$(srcdir)/.. libethereal_la_SOURCES = \ $(LIBETHEREAL_SRC) \ |