forked from osmocom/wireshark
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. svn path=/trunk/; revision=13322
This commit is contained in:
parent
1749a91a96
commit
a9cf4fccb6
|
@ -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+.
|
||||
|
|
|
@ -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) \
|
||||
|
|
Loading…
Reference in New Issue