Fix generated httpd.conf to respect layout for LoadModule lines.

PR:	8170
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Justin Erenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94921 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 9f3f5378a81b423f6db84f54f5cc7500090fa448..24a921185a07bffc37e9c27bb897620d13d70395 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.37
+
+  *) Fix generated httpd.conf to respect layout for LoadModule lines.
+     PR 8170.  [Thom May <thom@planetarytramp.net>]
+
   *) Win32: During a graceful restart, threads in the new process
      were accessing scoreboard slots still in use by active threads in 
      the the old process. [Bill Stoddard]

diff --git a/Makefile.in b/Makefile.in
index 01fabd6be7a3421eea22f235d96b5acb82ff6972..2b5f5c593ee4b4e6ac47c880fa07f8852c406f44 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -57,7 +57,7 @@ install-conf:
                                                echo "<IfDefine SSL>"; \
                                        fi; \
                                        if test $$j != "^EOL^"; then \
-                                               echo "LoadModule $${j}_module modules/mod_$${j}.so"; \
+                                               echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
                                        fi; \
                                        if test "x$$j" = "xssl"; then \
                                                echo "</IfDefine>"; \