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 29dd2deb90e7a46d75d7b924a69a78b115b60579..23c1c3b2b62be286222bcc99c238dc6aaa27931f 100644 (file)
--- 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 dba34417d70a8f7973d789a2e2deeaa2af77d818..a96db23d78c1c4c888e8e614887a5f6c01460248 100644 (file)
--- 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