From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Tue, 7 Jun 2005 18:54:25 +0000 (+0000)
Subject: * Makefile.in: Fix brokenness with VPATH builds as the .conf files do not exist
X-Git-Tag: 2.1.5~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=99cc1e829fac7319b7780bc05ee8668b8095ffad;p=apache

* Makefile.in: Fix brokenness with VPATH builds as the .conf files do not exist
  in srcdir and sh panics; also fix one whitespace issue.


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

diff --git a/Makefile.in b/Makefile.in
index 6d8348d9f4..d6cc4ef664 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,7 @@ install-conf:
 	for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
 	    cd $$j ; \
 	    for i in httpd.conf extra/httpd-*.conf; do \
+	    	if [ -f $$i ] ; then \
 	    	( \
 	    		n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
 	    		if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
@@ -74,13 +75,14 @@ install-conf:
 	    		fi \
 	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
 	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
-		file=$$i; \
+	    	file=$$i; \
 	    	if [ "$$i" = "httpd.conf" ]; then \
 	    		file=`echo $$i|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
 	    	fi; \
 	    	if test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
 	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 	    	fi; \
+	    	fi; \
 	    done ; \
 	done ; \
 	if test -f "$(builddir)/envvars-std"; then \