Make apxs look in the correct directory for envvars. It was

broken when sbindir != bindir.

PR:           8869
Submitted by: Andreas Sundstr�m <sunkan@zappa.cx>
Reviewed by:  Jeff Trawick

(This fix has been posted by others too.)

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

diff --git a/CHANGES b/CHANGES
index be866a5dc7e0761d19b7dd6d9aa25416da278aae..79915bb9a3c55cab18395f7dd2d6898966ed7881 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.37
 
+  *) Make apxs look in the correct directory for envvars.  It was
+     broken when sbindir != bindir.  PR 8869
+     [Andreas Sundström <sunkan@zappa.cx>]
+  
   *) Fix mod_deflate corruption when using multiple buckets.  PR 9014.
      [Asada Kazuhisa <kaz@asada.sytes.net>]
 

diff --git a/support/apxs.in b/support/apxs.in
index 4bc49357407e6180498d2178765bb4becca269b0..3a9692123ccb9f0e6fc351675b3564a40b0311e2 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -223,7 +223,7 @@ if (@opt_S) {
 my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
 $httpd = eval qq("$httpd");
 $httpd = eval qq("$httpd");
-my $envvars = get_vars("bindir") . "/envvars";
+my $envvars = get_vars("sbindir") . "/envvars";
 $envvars = eval qq("$envvars");
 $envvars = eval qq("$envvars");