From: Greg Ames <gregames@apache.org>
Date: Fri, 19 Jul 2002 15:11:58 +0000 (+0000)
Subject: Install mime.types and magic in conf/ if they don't already exist.
X-Git-Tag: 2.0.40~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3151bec9d9234811c07d070b2e7406b0520ebe9f;p=apache

Install mime.types and magic in conf/ if they don't already exist.

This also re-enables existing logic to always install *-std.conf with
substitutions made.  These are then copied into *.conf (without the -std) if
that file doesn't already exist.

style police: please chill for a bit.  I intentionally didn't re-format
the indenting in this commit to make it easier to review.


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

diff --git a/Makefile.in b/Makefile.in
index 19cc733df0..b9d183e93a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,14 +27,15 @@ include $(top_builddir)/build/rules.mk
 include $(top_srcdir)/build/program.mk
 
 install-conf:
-	-@if [ -d $(DESTDIR)$(sysconfdir) ]; then \
-           echo "[PRESERVING EXISTING CONF SUBDIR: $(DESTDIR)$(sysconfdir)]"; \
-        else \
-	    echo Installing configuration files ; \
+	@echo Installing configuration files ; \
+	if [ -d $(DESTDIR)$(sysconfdir) ]; then \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
+	fi ; \
 	    cd $(top_srcdir)/docs/conf; \
 	    for i in mime.types magic; do \
+	        if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
 	    	$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+	        fi; \
 	    done; \
 	    for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
 	    	cd $$j ; \
@@ -86,7 +87,6 @@ install-conf:
 	        if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
 	            cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
 	        fi ; \
-	    fi ; \
 	fi
 
 install-build: