Commit 43dcec10 authored by Joshua Slive's avatar Joshua Slive
Browse files

Make sure we don't overwrite existing config if it 

has a name other than httpd.conf.

Submitted by: Rici Lake


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161776 13f79535-47bb-0310-9956-ffa450edef68
parent 85ffaab2

Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ install-conf: 
	    	if [ "$$i" = "httpd.conf" ]; then \

	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \

	    	fi; \

	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \

	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \

	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \

	    	fi; \

	    done ; \