[Bug 1839] 4.2.7p131 installs libevent ev*.h headers.

bk: 4d67a294Tiis-u1o7vn2ezHRY4J2sQ

diff --git a/ChangeLog b/ChangeLog
index 06847d1730b83cae26829859ff07783134651fae..b27476feecfcca7b7cf7668f4f1fc4e0f0daeb2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1839] 4.2.7p131 installs libevent ev*.h headers.
 * Ensure CONFIG_SHELL is not empty before relying on it for #! scripts.
 (4.2.7p134) 2011/02/24 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1837] Build fails on Win7 due to regedit requiring privilege.

diff --git a/sntp/libevent/include/Makefile.am b/sntp/libevent/include/Makefile.am
index b109ff797a30840c7e6bc2203aa64cf6b12c73d5..fbf459ebb7c707746d4c75376b04c7f14d752382 100644 (file)
--- a/sntp/libevent/include/Makefile.am
+++ b/sntp/libevent/include/Makefile.am
@@ -28,7 +28,14 @@ EVENT2_EXPORT = \
 
 EXTRA_SRC = $(EVENT2_EXPORT)
 
-nobase_include_HEADERS = $(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