r14702@tombo: nickm | 2007-11-04 15:48:56 -0500

 Define SHARE_DATADIR, LOCALSTATEDIR, and BINDIR in Makefile.am as autoconf recommends.  Do not move CONFDIR yet, since we seem to support overriding it in a weird way.  Resolves bug 542.

svn:r12376

diff --git a/configure.in b/configure.in
index b465ad5befef08f8bb419a544236d9961e2b7685..13ac3429daf54b8c089af898713e80b4e85bc235 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -617,21 +617,6 @@ AC_SUBST(CONFDIR)
 AH_TEMPLATE([CONFDIR],[tor's configuration directory])
 AC_DEFINE_UNQUOTED(CONFDIR,"$CONFDIR")
 
-BINDIR=`eval echo $bindir`
-AC_SUBST(BINDIR)
-
-LOCALSTATEDIR=`eval echo $localstatedir`
-AC_SUBST(LOCALSTATEDIR)
-AH_TEMPLATE([LOCALSTATEDIR], [Default location to store state files.])
-AC_DEFINE_UNQUOTED(LOCALSTATEDIR,"$LOCALSTATEDIR")
-
-dnl Note: this is not the same as Tor's "DataDir" config option.
-dnl   We'd call it 'DATADIR', except that's a symbol in MinGW's objidl.h.  
-SHARE_DATADIR=`eval echo $datadir`
-AC_SUBST(SHARE_DATADIR)
-AH_TEMPLATE([SHARE_DATADIR], [Default location for platform-independent read-only data.])
-AC_DEFINE_UNQUOTED(SHARE_DATADIR,"$SHARE_DATADIR")
-
 # Set CFLAGS _after_ all the above checks, since our warnings are stricter
 # than autoconf's macros like.
 if test $ac_cv_c_compiler_gnu = yes; then

diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 22ceac945da6299983cf17294e287c3b97001a6f..bcc588f9bb3c6af43648c2446b3241c67fd74f5a 100644 (file)
--- a/src/or/Makefile.am
+++ b/src/or/Makefile.am
@@ -23,6 +23,10 @@ tor_SOURCES = buffers.c circuitbuild.c circuitlist.c \
        eventdns.c \
        tor_main.c
 
+AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
+        -DLOCALSTATEDIR="\"$(localstatedir)\"" \
+        -DBINDIR="\"$(bindir)\""
+
 # -L flags need to go in LDFLAGS. -l flags need to go in LDADD.
 # This seems to matter nowhere but on windows, but I assure you that it
 # matters a lot there, and is quite hard to debug if you forget to do it.