From: Greg Ames <gregames@apache.org>
Date: Fri, 2 Mar 2001 15:46:14 +0000 (+0000)
Subject: fix make install so that suexec is installed where the server expects to
X-Git-Tag: 2.0.14~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c21e3c3fddd2402d093dd50201ad0aea9d49045;p=thirdparty%2Fapache%2Fhttpd.git

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 313dc2be345..07b082ace40 100644
--- 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 4cb5185692a..90b91011b25 100644
--- 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)