Commit a5132d99 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Make Apache 2.0 install all files in the same location as Apache 1.3 

did.
PR:	7626


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90877 13f79535-47bb-0310-9956-ffa450edef68
parent 309266ed

build/rules.mk.in

+2 −2
Original line number Diff line number Diff line
@@ -197,9 +197,9 @@ local-extraclean: local-distclean x-local-extraclean 


local-install: $(TARGETS) $(SHARED_TARGETS) $(INSTALL_TARGETS)

	@if test -n '$(PROGRAMS)'; then \

	    test -d $(bindir) || $(MKINSTALLDIRS) $(bindir); \

	    test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \

	    list='$(PROGRAMS)'; for i in $$list; do \

	        $(INSTALL_PROGRAM) $$i $(bindir); \

	        $(INSTALL_PROGRAM) $$i $(sbindir); \

	    done; \

	fi

support/Makefile.in

+5 −5
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ include $(top_srcdir)/build/rules.mk 


install:

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

	@cp -p $(top_srcdir)/server/httpd.exp $(bindir)

	@cp -p apachectl $(bindir)

	chmod 755 $(bindir)/apachectl

	@cp -p $(top_srcdir)/server/httpd.exp $(libexecdir)

	@cp -p apachectl $(sbindir)

	chmod 755 $(sbindir)/apachectl

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

	    cp -p apxs $(bindir); \

	    chmod 755 $(bindir)/apxs; \

	    cp -p apxs $(sbindir); \

	    chmod 755 $(sbindir)/apxs; \

	fi



htpasswd_OBJECTS = htpasswd.lo