httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1221292 - in /httpd/httpd/trunk: build/rpm/httpd.spec.in docs/man/ab.1 docs/man/ab.8 docs/man/apxs.1 docs/man/apxs.8 docs/man/logresolve.1 docs/man/logresolve.8 support/Makefile.in
Date Tue, 20 Dec 2011 14:51:10 GMT
Author: minfrin
Date: Tue Dec 20 14:51:10 2011
New Revision: 1221292

URL: http://svn.apache.org/viewvc?rev=1221292&view=rev
Log:
Move ab, logresolve, httxt2dbm and apxs to bin from sbin, along with
corresponding man pages.

Added:
    httpd/httpd/trunk/docs/man/ab.1
      - copied unchanged from r1220843, httpd/httpd/trunk/docs/man/ab.8
    httpd/httpd/trunk/docs/man/apxs.1
      - copied unchanged from r1220843, httpd/httpd/trunk/docs/man/apxs.8
    httpd/httpd/trunk/docs/man/logresolve.1
      - copied unchanged from r1220843, httpd/httpd/trunk/docs/man/logresolve.8
Removed:
    httpd/httpd/trunk/docs/man/ab.8
    httpd/httpd/trunk/docs/man/apxs.8
    httpd/httpd/trunk/docs/man/logresolve.8
Modified:
    httpd/httpd/trunk/build/rpm/httpd.spec.in
    httpd/httpd/trunk/support/Makefile.in

Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=1221292&r1=1221291&r2=1221292&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Tue Dec 20 14:51:10 2011
@@ -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

Modified: httpd/httpd/trunk/support/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/Makefile.in?rev=1221292&r1=1221291&r2=1221292&view=diff
==============================================================================
--- httpd/httpd/trunk/support/Makefile.in (original)
+++ httpd/httpd/trunk/support/Makefile.in Tue Dec 20 14:51:10 2011
@@ -3,8 +3,8 @@ DISTCLEAN_TARGETS = apxs apachectl dbmma
 
 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; \



Mime
View raw message