This fixes the remaining $(top_srcdir) errors and properly generates event2/event-config.h
Signed-off-by: Daniel Martí <mv...@mvdan.cc>
---
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
--
Daniel Martí - mv...@mvdan.cc - http://mvdan.cc/
PGP: A9DA 13CD F7A1 4ACD D3DE E530 F4CA FFDB 4348 041C
pgp7ApV5DnQi4.pgp
Description: PGP signature
_______________________________________________ tor-dev mailing list tor-dev@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev
