From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 8 Nov 2009 05:38:46 +0000 (-0500)
Subject: Fix building from a separate build directory.
X-Git-Tag: tor-0.2.2.6-alpha~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69c0147ea6725a63f254333867c0504528c62daf;p=thirdparty%2Ftor.git

Fix building from a separate build directory.
---

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index ea7c67eda7..cdb5d85c28 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -4,9 +4,8 @@ noinst_PROGRAMS = test
 
 AM_CPPFLAGS = -DSHARE_DATADIR="\"$(datadir)\"" \
         -DLOCALSTATEDIR="\"$(localstatedir)\"" \
-        -DBINDIR="\"$(bindir)\""
-
-AM_CFLAGS = -I../or
+        -DBINDIR="\"$(bindir)\""	       \
+	-I"$(top_srcdir)/src/or"
 
 # -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