From e11231f5c7650e1e6b8a6fcb84b572ca6dbe2d4d Mon Sep 17 00:00:00 2001 From: Ryan Bloom Date: Fri, 5 Apr 2002 19:36:06 +0000 Subject: [PATCH] With VPATH builds, the httpd.conf-std file is found in the build directory, not the source directory. Make sure we check both from now on. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94460 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.in b/Makefile.in index d850fecd1a..88220cf2ef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,6 +35,8 @@ install-conf: for i in mime.types magic; do \ $(INSTALL_DATA) $$i $(sysconfdir); \ done; \ + for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \ + cd $$j ; \ for i in *-std* ssl.conf; do \ [ -f $$i ] || continue; \ ( \ @@ -76,6 +78,7 @@ install-conf: if test "$$file" != "$$i" && test ! -f $(sysconfdir)/$$file; then \ $(INSTALL_DATA) $(sysconfdir)/$$i $(sysconfdir)/$$file; \ fi; \ + done ; \ done @if test -f "$(builddir)/envvars-std"; then \ cp -p envvars-std $(sbindir); \ -- 2.50.1