Backport:

Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
corresponding man pages.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1221299 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 55d45ef421851499b8f6ef582e5359837052c93c..763955f8daf3b036ad9d17346b5f66b1f4234205 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.0
 
+  *) Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
+     corresponding man pages. [Graham Leggett]
+
   *) Distinguish properly between the bindir and sbindir directories when
      installing binaries. Previously all binaries were silently installed to
      sbindir, whether they were system administration commands or not.

diff --git a/build/rpm/httpd.spec.in b/build/rpm/httpd.spec.in
index fd95a1673c3770b76610c494e43608e245973a2e..ad8f72db8eeacfd754a75a943c6bf32b4a5ccfb9 100644 (file)
--- a/build/rpm/httpd.spec.in
+++ b/build/rpm/httpd.spec.in
@@ -424,7 +424,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0700,apache,apache) %dir %{_localstatedir}/cache/httpd/cache-root
 
 %{_mandir}/man1/*
-%{_mandir}/man8/ab*
 %{_mandir}/man8/suexec*
 %{_mandir}/man8/apachectl.8*
 %{_mandir}/man8/httpd.8*
@@ -437,18 +436,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(-,root,root)
-%{_sbindir}/ab
+%{_bindir}/ab
 %{_bindir}/htdbm
 %{_bindir}/htdigest
 %{_bindir}/htpasswd
-%{_sbindir}/logresolve
-%{_sbindir}/httxt2dbm
+%{_bindir}/logresolve
+%{_bindir}/httxt2dbm
 %{_sbindir}/rotatelogs
 %{_mandir}/man1/htdbm.1*
 %{_mandir}/man1/htdigest.1*
 %{_mandir}/man1/htpasswd.1*
-%{_mandir}/man8/ab.8*
-%{_mandir}/man8/logresolve.8*
+%{_mandir}/man1/ab.1*
+%{_mandir}/man1/logresolve.1*
 %{_mandir}/man8/rotatelogs.8*
 %doc LICENSE NOTICE
 
@@ -483,12 +482,12 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %{_includedir}/httpd
-%{_sbindir}/apxs
+%{_bindir}/apxs
 %{_sbindir}/checkgid
 %{_bindir}/dbmmanage
 %{_sbindir}/envvars*
 %{_mandir}/man1/dbmmanage.1*
-%{_mandir}/man8/apxs.8*
+%{_mandir}/man1/apxs.1*
 %dir %{_libdir}/httpd/build
 %{_libdir}/httpd/build/*.mk
 %{_libdir}/httpd/build/instdso.sh

diff --git a/docs/man/ab.8 b/docs/man/ab.1
similarity index 100%
rename from docs/man/ab.8
rename to docs/man/ab.1

diff --git a/docs/man/apxs.8 b/docs/man/apxs.1
similarity index 100%
rename from docs/man/apxs.8
rename to docs/man/apxs.1

diff --git a/docs/man/logresolve.8 b/docs/man/logresolve.1
similarity index 100%
rename from docs/man/logresolve.8
rename to docs/man/logresolve.1

diff --git a/support/Makefile.in b/support/Makefile.in
index 20be821a9ffa0fa5cfe3008f46916894186b3373..d307eaaed0cc1fa43f1bc7257c420819c1c5cc9d 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -3,8 +3,8 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
 
 CLEAN_TARGETS = suexec
 
-bin_PROGRAMS = htpasswd htdigest htdbm
-sbin_PROGRAMS = rotatelogs logresolve ab htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
+bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
+sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
 TARGETS  = $(bin_PROGRAMS) $(sbin_PROGRAMS)
 
 PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
@@ -17,13 +17,13 @@ install:
        @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
        @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
        @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
-       @for i in dbmmanage; do \
+       @for i in apxs dbmmanage; do \
            if test -f "$(builddir)/$$i"; then \
                cp -p $$i $(DESTDIR)$(bindir); \
                chmod 755 $(DESTDIR)$(bindir)/$$i; \
            fi ; \
        done
-       @for i in apxs apachectl; do \
+       @for i in apachectl; do \
            if test -f "$(builddir)/$$i"; then \
                cp -p $$i $(DESTDIR)$(sbindir); \
                chmod 755 $(DESTDIR)$(sbindir)/$$i; \