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

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.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220846 13f79535-47bb-0310-9956-ffa450edef68
parent 5581cc73

Makefile.in

+2 −2
Changes for Makefile.in: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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

build/rpm/httpd.spec.in

+6 −5
Changes for build/rpm/httpd.spec.in: 6 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -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

build/rules.mk.in

+8 −2
Changes for build/rules.mk.in: 8 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -166,9 +166,15 @@ local-extraclean: local-distclean x-local-extraclean 
	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

support/Makefile.in

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


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; \

test/Makefile.in

+2 −2
Changes for test/Makefile.in: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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