fix make install so that suexec is installed where the server expects to

find it ( <prefix>/sbin by default).

also enable ./configure --sbindir=DIR to work as advertised.

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

diff --git a/Makefile.in b/Makefile.in
index 313dc2be345f38b1e66ce1f50c34e75c76b9177f..07b082ace4059baedd6dd6f5500635cbef8bb5b0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,8 +117,8 @@ install-include:
 
 install-suexec:
        @if test -f $(builddir)/support/suexec; then \
-           $(MKINSTALLDIRS) $(bindir)/sbin; \
-           cp -p $(srcdir)/support/suexec $(bindir)/sbin; \
+            test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
+            cp -p $(srcdir)/support/suexec $(sbindir); \
        fi
 
 suexec:

diff --git a/acinclude.m4 b/acinclude.m4
index 4cb5185692ad4a08d58db7cba0fd92198a074dd6..90b91011b259324375e4eaf80539eb7184e0b7d3 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -57,6 +57,7 @@ dnl Creates config_vars.mk
 AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(abs_srcdir)
   APACHE_SUBST(bindir)
+  APACHE_SUBST(sbindir)
   APACHE_SUBST(cgidir)
   APACHE_SUBST(logdir)
   APACHE_SUBST(exec_prefix)