Back out the previous change - we were setting "datafiledir", not

"datafile", and code in epan/filesystem.c expectes DATAFILE_DIR to be
set to the "ethereal" subdirectory of the data directory, not to the
data directory itself.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@13322 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/configure.in b/configure.in
index f417af6f8290e7f27ab0f07a5bf8b6270c5ea6d6..b51b4e171f37f35e9a080d28ef3ae1856baecde8 100644 (file)
--- 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 849c0e28b13a0acb18df609f70d3ab3f11e436b0..1214e92a70c9efdd267eaa1172c0ac46d9c715c8 100644 (file)
--- 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)      \