From: Ryan Bloom <rbb@apache.org>
Date: Mon, 3 Sep 2001 03:27:48 +0000 (+0000)
Subject: Make Apache 2.0 install all files in the same location as Apache 1.3
X-Git-Tag: 2.0.26~337
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88e74ea2c688f3e3695084ef756f6b6e29ff3a37;p=apache

Make Apache 2.0 install all files in the same location as Apache 1.3
did.
PR:	7626


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

diff --git a/build/rules.mk.in b/build/rules.mk.in
index 29dd2deb90..23c1c3b2b6 100644
--- a/build/rules.mk.in
+++ b/build/rules.mk.in
@@ -197,9 +197,9 @@ local-extraclean: local-distclean x-local-extraclean
 
 local-install: $(TARGETS) $(SHARED_TARGETS) $(INSTALL_TARGETS)
 	@if test -n '$(PROGRAMS)'; then \
-	    test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \
+	    test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \
 	    list='$(PROGRAMS)'; for i in $$list; do \
-	        $(INSTALL_PROGRAM) $$i $(bindir); \
+	        $(INSTALL_PROGRAM) $$i $(sbindir); \
 	    done; \
 	fi
 
diff --git a/support/Makefile.in b/support/Makefile.in
index dba34417d7..a96db23d78 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -13,12 +13,12 @@ include $(top_srcdir)/build/rules.mk
 
 install:
 	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
-	@cp -p $(top_srcdir)/server/httpd.exp $(bindir)
-	@cp -p apachectl $(bindir)
-	chmod 755 $(bindir)/apachectl
+	@cp -p $(top_srcdir)/server/httpd.exp $(libexecdir)
+	@cp -p apachectl $(sbindir)
+	chmod 755 $(sbindir)/apachectl
 	@if test -f $(builddir)/apxs; then \
-	    cp -p apxs $(bindir); \
-	    chmod 755 $(bindir)/apxs; \
+	    cp -p apxs $(sbindir); \
+	    chmod 755 $(sbindir)/apxs; \
 	fi
 
 htpasswd_OBJECTS = htpasswd.lo