Properly substitute sbindir as httpd's location in apachectl.

We install $(PROGRAMS) into $(sbindir) not $(bindir), so this is correct.

PR: 7840
Submitted by:	Andreas Hasenack <andreas@netbank.com.br>
Reviewed by:	Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index 0e30f9342c82de07e9a7abf8cd74938b455e7522..bc7104e445604dea82b34711d4923854d9a03fd7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.36
 
+  *) Properly substitute sbindir as httpd's location in apachectl.  PR 7840.
+     [Andreas Hasenack <andreas@netbank.com.br>]
+
   *) Allow Win32 shebang scripts to follow the path (or omit the .exe
      suffix from the shebang command), and allow ScriptInterpreterSource
      Registry or RegistryStrict to override shebang lines, as 1.3 did.

diff --git a/docs/conf/.cvsignore b/docs/conf/.cvsignore
index 145b7faf1a56e73f7260552726141ea546555a3a..fe809e10482bd8060f1ecea7c861215b21a30e39 100644 (file)
--- a/docs/conf/.cvsignore
+++ b/docs/conf/.cvsignore
@@ -1 +1,2 @@
 httpd-std.conf
+ssl-std.conf

diff --git a/support/apachectl.in b/support/apachectl.in
index b8c9ee659dac6bf8ed16be0366fedbd8e6ac1c5d..8b316bc27d8afbb91fe0e7fd79d65602947bda72 100644 (file)
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -29,7 +29,7 @@ ARGV="$@"
 PIDFILE=@exp_runtimedir@/@progname@.pid
 #
 # the path to your httpd binary, including options if necessary
-HTTPD='@exp_bindir@/@progname@'
+HTTPD='@exp_sbindir@/@progname@'
 #
 # pick up any necessary environment variables
 if test -f @exp_bindir@/envvars; then