Commit 566c0ba4 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Do not install the binaries from the support directory twice. 

PR:	7490
Submitted by:	jun-ichiro hagino <itojun@iijlab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88836 13f79535-47bb-0310-9956-ffa450edef68
parent 5f5d42a4

CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.17-dev



  *) Do not install the binaries from the support directory twice.

     [jun-ichiro hagino <itojun@iijlab.net>]



  *) The ap_f* functions should flush data to the filter that is passed

     in, not the the filter after the one passed in.

     [Ryan Morgan <rmorgan@covalent.net>]

Makefile.in

+1 −18
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ PROGRAMS = $(PROGRAM_NAME) 
targets         = $(PROGRAMS) $(other_targets)

phony_targets   = $(srcdir)/buildmark.c

install_targets = install-conf install-htdocs install-icons install-other \

	install-cgi install-include install-support install-suexec

	install-cgi install-include install-suexec

DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \

	modules.c libtool

EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in \
@@ -75,23 +75,6 @@ install-cgi: 
	@(cd docs/cgi-examples && cp -rp * $(cgidir))

	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)



install-support:

	@echo Installing Support Binaries

	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)

	@cp -p $(srcdir)/support/httpd.exp $(bindir)

	@cp -p $(builddir)/support/htpasswd $(bindir)

	@cp -p $(builddir)/support/htdigest $(bindir)

	@cp -p $(builddir)/support/rotatelogs $(bindir)

	@cp -p $(builddir)/support/logresolve $(bindir)

	@cp -p $(builddir)/support/ab $(bindir)

	@cp -p $(builddir)/support/apachectl $(bindir)

	chmod 755 $(bindir)/apachectl

	@if test -f $(builddir)/support/apxs; then \

	    cp -p $(builddir)/support/apxs $(bindir); \

	    chmod 755 $(bindir)/apxs; \

	fi





install-other:

	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)

	@for ext in dll x; do \

support/Makefile.in

+10 −0
Original line number Diff line number Diff line
@@ -10,6 +10,16 @@ PROGRAM_DEPENDENCIES = \ 


include $(top_srcdir)/build/rules.mk



install:

	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)

	@cp -p httpd.exp $(bindir)

	@cp -p apachectl $(bindir)

	chmod 755 $(bindir)/apachectl

	@if test -f $(builddir)/apxs; then \

	    cp -p apxs $(bindir); \

	    chmod 755 $(bindir)/apxs; \

	fi



htpasswd_OBJECTS = htpasswd.lo

htpasswd: $(htpasswd_OBJECTS)

	$(LINK) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)