From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Tue, 20 Nov 2001 20:14:58 +0000 (+0000)
Subject: apxs should be using sbindir not bindir for the path to the httpd binary.
X-Git-Tag: 2.0.29~77
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9822212ea3ca484888ff2bd1c6ba44e9e48386f3;p=thirdparty%2Fapache%2Fhttpd.git

apxs should be using sbindir not bindir for the path to the httpd binary.

Committed with some minor changes.
Submitted by:	GOMEZ Henri <hgomez@slib.fr>
Reviewed by:	Justin Erenkrantz


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

diff --git a/CHANGES b/CHANGES
index 20a8b565711..0d538096158 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.29-dev
 
+  *) Fix apxs to use sbindir.  [Henri Gomez <hgomez@slib.fr>]
+
   *) Fix a problem with IPv6 vhosts.  PR #8118  [Jeff Trawick]
 
   *) Optimization for the BNDM string-search function in
diff --git a/support/apxs.in b/support/apxs.in
index 92a4c4111e2..2ecb3841799 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -78,8 +78,8 @@ my $CFG_INCLUDEDIR = eval qq("$includedir");
 my $CFG_CC         = get_vars("CC");
 my $libexecdir     = get_vars("libexecdir");
 my $CFG_LIBEXECDIR = eval qq("$libexecdir");
-my $bindir         = get_vars("bindir");
-my $CFG_SBINDIR    = eval qq("$bindir");
+my $sbindir        = get_vars("sbindir");
+my $CFG_SBINDIR    = eval qq("$sbindir");
 
 my %internal_vars = map {$_ => 1}
     qw(TARGET CC CFLAGS CFLAGS_SHLIB LD_SHLIB LDFLAGS_SHLIB LIBS_SHLIB
@@ -218,7 +218,7 @@ if (@opt_S) {
 ##
 ##  Initial shared object support check
 ##
-my $httpd = get_vars("bindir") . "/" . get_vars("progname");
+my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
 $httpd = eval qq("$httpd");
 $httpd = eval qq("$httpd");