Commit e1a33fc7 authored by Graham Leggett's avatar Graham Leggett
Browse files

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/trunk@1221292 13f79535-47bb-0310-9956-ffa450edef68
parent 5a2057ce

build/rpm/httpd.spec.in

+7 −8
Changes for build/rpm/httpd.spec.in: 7 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -427,7 +427,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*
@@ -440,20 +439,20 @@ rm -rf $RPM_BUILD_ROOT 


%files tools

%defattr(-,root,root)

%{_sbindir}/ab

%{_bindir}/ab

%{_bindir}/firehose

%{_bindir}/htdbm

%{_bindir}/htdigest

%{_bindir}/htpasswd

%{_sbindir}/logresolve

%{_sbindir}/httxt2dbm

%{_bindir}/logresolve

%{_bindir}/httxt2dbm

%{_sbindir}/rotatelogs

%{_mandir}/man1/firehose.1*

%{_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
@@ -488,12 +487,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

docs/man/ab.8→docs/man/ab.1

+0 −0

File moved.

View file

docs/man/apxs.8→docs/man/apxs.1

+0 −0

File moved.

View file

docs/man/logresolve.8→docs/man/logresolve.1

+0 −0

File moved.

View file

support/Makefile.in

+4 −4
Changes for support/Makefile.in: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ 


CLEAN_TARGETS = suexec



bin_PROGRAMS = htpasswd htdigest htdbm firehose

sbin_PROGRAMS = rotatelogs logresolve ab htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)

bin_PROGRAMS = htpasswd htdigest htdbm firehose 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; \