You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/19 18:00:50 UTC
svn commit: r1220846 - in /httpd/httpd/trunk: Makefile.in
build/rpm/httpd.spec.in build/rules.mk.in support/Makefile.in
test/Makefile.in
Author: minfrin
Date: Mon Dec 19 17:00:49 2011
New Revision: 1220846
URL: http://svn.apache.org/viewvc?rev=1220846&view=rev
Log:
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.
Modified:
httpd/httpd/trunk/Makefile.in
httpd/httpd/trunk/build/rpm/httpd.spec.in
httpd/httpd/trunk/build/rules.mk.in
httpd/httpd/trunk/support/Makefile.in
httpd/httpd/trunk/test/Makefile.in
Modified: httpd/httpd/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.in?rev=1220846&r1=1220845&r2=1220846&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.in (original)
+++ httpd/httpd/trunk/Makefile.in Mon Dec 19 17:00:49 2011
@@ -12,8 +12,8 @@ PROGRAM_DEPENDENCIES = \
$(MPM_LIB) \
os/$(OS_DIR)/libos.la
-PROGRAMS = $(PROGRAM_NAME)
-TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
+sbin_PROGRAMS = $(PROGRAM_NAME)
+TARGETS = $(sbin_PROGRAMS) $(shared_build) $(other_targets)
INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
install-other install-cgi install-include install-suexec install-build \
install-man
Modified: httpd/httpd/trunk/build/rpm/httpd.spec.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rpm/httpd.spec.in?rev=1220846&r1=1220845&r2=1220846&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rpm/httpd.spec.in (original)
+++ httpd/httpd/trunk/build/rpm/httpd.spec.in Mon Dec 19 17:00:49 2011
@@ -441,13 +441,13 @@ rm -rf $RPM_BUILD_ROOT
%files tools
%defattr(-,root,root)
%{_sbindir}/ab
-%{_sbindir}/htdbm
-%{_sbindir}/htdigest
-%{_sbindir}/htpasswd
+%{_bindir}/firehose
+%{_bindir}/htdbm
+%{_bindir}/htdigest
+%{_bindir}/htpasswd
%{_sbindir}/logresolve
%{_sbindir}/httxt2dbm
%{_sbindir}/rotatelogs
-%{_mandir}/man1/dbmmanage.1*
%{_mandir}/man1/firehose.1*
%{_mandir}/man1/htdbm.1*
%{_mandir}/man1/htdigest.1*
@@ -490,8 +490,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/httpd
%{_sbindir}/apxs
%{_sbindir}/checkgid
-%{_sbindir}/dbmmanage
+%{_bindir}/dbmmanage
%{_sbindir}/envvars*
+%{_mandir}/man1/dbmmanage.1*
%{_mandir}/man8/apxs.8*
%dir %{_libdir}/httpd/build
%{_libdir}/httpd/build/*.mk
Modified: httpd/httpd/trunk/build/rules.mk.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/rules.mk.in?rev=1220846&r1=1220845&r2=1220846&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rules.mk.in (original)
+++ httpd/httpd/trunk/build/rules.mk.in Mon Dec 19 17:00:49 2011
@@ -166,9 +166,15 @@ local-extraclean: local-distclean x-loca
fi
program-install: $(TARGETS) $(SHARED_TARGETS)
- @if test -n '$(PROGRAMS)'; then \
+ @if test -n '$(bin_PROGRAMS)'; then \
+ test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir); \
+ list='$(bin_PROGRAMS)'; for i in $$list; do \
+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(bindir); \
+ done; \
+ fi
+ @if test -n '$(sbin_PROGRAMS)'; then \
test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
- list='$(PROGRAMS)'; for i in $$list; do \
+ list='$(sbin_PROGRAMS)'; for i in $$list; do \
$(INSTALL_PROGRAM) $$i $(DESTDIR)$(sbindir); \
done; \
fi
Modified: httpd/httpd/trunk/support/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/support/Makefile.in?rev=1220846&r1=1220845&r2=1220846&view=diff
==============================================================================
--- httpd/httpd/trunk/support/Makefile.in (original)
+++ httpd/httpd/trunk/support/Makefile.in Mon Dec 19 17:00:49 2011
@@ -3,8 +3,9 @@ DISTCLEAN_TARGETS = apxs apachectl dbmma
CLEAN_TARGETS = suexec
-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm firehose $(NONPORTABLE_SUPPORT)
-TARGETS = $(PROGRAMS)
+bin_PROGRAMS = htpasswd htdigest htdbm firehose
+sbin_PROGRAMS = rotatelogs logresolve ab htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
+TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
PROGRAM_DEPENDENCIES =
@@ -16,7 +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 apxs apachectl dbmmanage; do \
+ @for i in 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 \
if test -f "$(builddir)/$$i"; then \
cp -p $$i $(DESTDIR)$(sbindir); \
chmod 755 $(DESTDIR)$(sbindir)/$$i; \
Modified: httpd/httpd/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/Makefile.in?rev=1220846&r1=1220845&r2=1220846&view=diff
==============================================================================
--- httpd/httpd/trunk/test/Makefile.in (original)
+++ httpd/httpd/trunk/test/Makefile.in Mon Dec 19 17:00:49 2011
@@ -3,7 +3,7 @@
# test programs, then "make test"
TARGETS =
-PROGRAMS =
+bin_PROGRAMS =
PROGRAM_LDADD = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
PROGRAM_DEPENDENCIES = \
@@ -12,7 +12,7 @@ PROGRAM_DEPENDENCIES = \
include $(top_builddir)/build/rules.mk
-test: $(PROGRAMS)
+test: $(bin_PROGRAMS)
# example for building a test proggie
# dbu_OBJECTS = dbu.lo