Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-06-21 10:07:04 -04:00
commit 722207ff9e

View File

@ -70,7 +70,9 @@ VERSION_INFO = 1:0:0
# is user-visible, and so we can pretty much guarantee that release # is user-visible, and so we can pretty much guarantee that release
# series won't be binary-compatible. # series won't be binary-compatible.
if INSTALL_LIBEVENT
dist_bin_SCRIPTS = event_rpcgen.py dist_bin_SCRIPTS = event_rpcgen.py
endif
pkgconfigdir=$(libdir)/pkgconfig pkgconfigdir=$(libdir)/pkgconfig
LIBEVENT_PKGCONFIG=libevent.pc LIBEVENT_PKGCONFIG=libevent.pc
@ -84,6 +86,7 @@ PLATFORM_DEPENDENT_SRC = \
EXTRA_DIST = \ EXTRA_DIST = \
LICENSE \ LICENSE \
autogen.sh \ autogen.sh \
event_rpcgen.py \
libevent.pc.in \ libevent.pc.in \
Doxyfile \ Doxyfile \
whatsnew-2.0.txt \ whatsnew-2.0.txt \