diff options
author | Graham Leggett <minfrin@apache.org> | 2011-12-20 14:57:46 +0000 |
---|---|---|
committer | Graham Leggett <minfrin@apache.org> | 2011-12-20 14:57:46 +0000 |
commit | d5d1561556024315d3709f25232476729cebb446 (patch) | |
tree | 6011337eaccdec22400c3887d648c1c105e95615 | |
parent | 7df75d7484726ca8aa39a64d751d950911d0376d (diff) | |
download | httpd-d5d1561556024315d3709f25232476729cebb446.tar.gz |
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
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | build/rpm/httpd.spec.in | 15 | ||||
-rw-r--r-- | docs/man/ab.1 (renamed from docs/man/ab.8) | 0 | ||||
-rw-r--r-- | docs/man/apxs.1 (renamed from docs/man/apxs.8) | 0 | ||||
-rw-r--r-- | docs/man/logresolve.1 (renamed from docs/man/logresolve.8) | 0 | ||||
-rw-r--r-- | support/Makefile.in | 8 |
6 files changed, 14 insertions, 12 deletions
@@ -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 fd95a1673c..ad8f72db8e 100644 --- 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 index 3e1b73cd6a..3e1b73cd6a 100644 --- a/docs/man/ab.8 +++ b/docs/man/ab.1 diff --git a/docs/man/apxs.8 b/docs/man/apxs.1 index 37a6a529aa..37a6a529aa 100644 --- a/docs/man/apxs.8 +++ b/docs/man/apxs.1 diff --git a/docs/man/logresolve.8 b/docs/man/logresolve.1 index 5820739e8b..5820739e8b 100644 --- a/docs/man/logresolve.8 +++ b/docs/man/logresolve.1 diff --git a/support/Makefile.in b/support/Makefile.in index 20be821a9f..d307eaaed0 100644 --- 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; \ |