Merge remote branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-02-25 10:42:58 -05:00
commit 83fb674a75

View File

@ -28,7 +28,14 @@ EVENT2_EXPORT = \
EXTRA_SRC = $(EVENT2_EXPORT)
## Without the nobase_ prefixing, Automake would strip "event2/" from
## the source header filename to derive the installed header filename.
## With nobase_ the installed path is $(includedir)/event2/ev*.h.
if INSTALL_LIBEVENT
nobase_include_HEADERS = $(EVENT2_EXPORT)
nobase_nodist_include_HEADERS = ./event2/event-config.h
else
noinst_HEADERS = $(EVENT2_EXPORT)
nodist_noinst_HEADERS = ./event2/event-config.h
endif