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

diff --git a/Makefile.in b/Makefile.in
index d850fecd1af3ff01016ef94db133d119ad87d6fa..88220cf2efc5a2c280bdfc9e2a7cc0f3fb59a44d 100644 (file)
--- 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); \