[tor-commits] [orbot/master] Signed-off-by: Nathan Freitas <nathan at freitas.net>

n8fr8 at torproject.org n8fr8 at torproject.org
Fri Apr 4 03:27:24 UTC 2014


commit 75a0d34e2886ac771cc19c564d0757c7cdcc95f8
Author: Daniel Martí <mvdan at mvdan.cc>
Date:   Thu Mar 27 13:46:34 2014 -0400

    Signed-off-by: Nathan Freitas <nathan at freitas.net>
---
 external/Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/external/Makefile b/external/Makefile
index bce8d83..7a9f637 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -116,6 +116,8 @@ openssl-clean:
 # libevent
 
 libevent/Makefile:
+	sed -i 's@\(SUBDIRS = . include\) sample test@\1@' libevent/Makefile.am
+	sed -i 's@\(AC_OUTPUT(Makefile include/Makefile\) test/Makefile sample/Makefile)@\1)@' libevent/configure.in
 	cd libevent && ./autogen.sh
 	cp config.sub libevent
 	cp config.guess libevent
@@ -126,7 +128,7 @@ libevent/Makefile:
 				--disable-shared
 
 libevent-build-stamp: libevent/Makefile
-	$(MAKE) -C libevent all-am
+	$(MAKE) -C libevent ./include/event2/event-config.h all-am
 	touch libevent-build-stamp
 
 libevent: openssl libevent-build-stamp





More information about the tor-commits mailing list