From: Joshua Slive <slive@apache.org>
Date: Mon, 18 Apr 2005 17:16:21 +0000 (+0000)
Subject: Make sure we don't overwrite existing config if it
X-Git-Tag: 2.1.5~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d32896c9c26ec4662582ed28a6e51d31b015b45;p=thirdparty%2Fapache%2Fhttpd.git

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

diff --git a/Makefile.in b/Makefile.in
index d75b567cc59..87ad28f470d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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 ; \