From 446c3513939f6257b2f880154e209861260f4e55 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 4 Nov 2007 20:49:02 +0000 Subject: 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 --- configure.in | 15 --------------- src/or/Makefile.am | 4 ++++ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index b465ad5bef..13ac3429da 100644 --- 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 22ceac945d..bcc588f9bb 100644 --- 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. -- cgit v1.2.3-54-g00ecf