--- Makefile.win	(Revision 170130)
+++ Makefile.win	(working copy)
@@ -661,7 +661,7 @@ 
 <<
 	if not exist "$(INSTDIR)\conf\httpd.conf" \
 	    copy "$(INSTDIR)\conf\original\httpd.conf" "$(INSTDIR)\conf\httpd.conf"
-	copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\httpd-autoindex.conf" <.y
+	copy docs\conf\extra\httpd-autoindex.conf.in "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf" <.y
 	-awk -f <<script.awk "docs/conf/extra/httpd-autoindex.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf"
     BEGIN { 
 	serverroot = ARGV[2];
@@ -675,9 +675,9 @@ 
 	print $$0;
     }
 <<
-	if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \
-	    copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"
-	copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\httpd-dav.conf" <.y
+	if not exist "$(INSTDIR)\conf\extra\httpd-autoindex.conf" \
+	    copy "$(INSTDIR)\conf\original\extra\httpd-autoindex.conf" "$(INSTDIR)\conf\extra\httpd-autoindex.conf"
+	copy docs\conf\extra\httpd-dav.conf.in "$(INSTDIR)\conf\original\extra\httpd-dav.conf" <.y
 	-awk -f <<script.awk "docs/conf/extra/httpd-dav.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-dav.conf"
     BEGIN { 
 	serverroot = ARGV[2];
@@ -693,7 +693,7 @@ 
 <<
 	if not exist "$(INSTDIR)\conf\extra\httpd-dav.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-dav.conf" "$(INSTDIR)\conf\extra\httpd-dav.conf"
-	copy docs\conf\extra\httpd-manual.conf.in "$(INSTDIR)\conf\original\httpd-manual.conf" <.y
+	copy docs\conf\extra\httpd-manual.conf.in "$(INSTDIR)\conf\original\extra\httpd-manual.conf" <.y
 	-awk -f <<script.awk "docs/conf/extra/httpd-manual.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-manual.conf"
     BEGIN { 
 	serverroot = ARGV[2];
@@ -709,7 +709,7 @@ 
 <<
 	if not exist "$(INSTDIR)\conf\extra\httpd-manual.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-manual.conf" "$(INSTDIR)\conf\extra\httpd-manual.conf"
-	copy docs\conf\extra\httpd-multilang-errordoc.conf.in "$(INSTDIR)\conf\original\httpd-multilang-errordoc.conf" <.y
+	copy docs\conf\extra\httpd-multilang-errordoc.conf.in "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" <.y
 	-awk -f <<script.awk "docs/conf/extra/httpd-multilang-errordoc.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf"
     BEGIN { 
 	serverroot = ARGV[2];
@@ -725,7 +725,7 @@ 
 <<
 	if not exist "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-multilang-errordoc.conf" "$(INSTDIR)\conf\extra\httpd-multilang-errordoc.conf"
-	copy docs\conf\extra\httpd-ssl.conf.in "$(INSTDIR)\conf\original\httpd-ssl.conf" <.y
+	copy docs\conf\extra\httpd-ssl.conf.in "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" <.y
 	-awk -f <<script.awk "docs/conf/extra/httpd-ssl.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-ssl.conf"
     BEGIN { 
 	serverroot = ARGV[2];
@@ -746,7 +746,7 @@ 
 <<
 	if not exist "$(INSTDIR)\conf\extra\httpd-ssl.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-ssl.conf" "$(INSTDIR)\conf\extra\httpd-ssl.conf"
-	copy docs\conf\extra\httpd-userdir.conf.in "$(INSTDIR)\conf\original\httpd-userdir.conf" <.y
+	copy docs\conf\extra\httpd-userdir.conf.in "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" <.y
 	-awk -f <<script.awk "docs/conf/extra/httpd-userdir.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-userdir.conf"
     BEGIN { 
 	serverroot = ARGV[2];
@@ -763,7 +763,7 @@ 
 <<
 	if not exist "$(INSTDIR)\conf\extra\httpd-userdir.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-userdir.conf" "$(INSTDIR)\conf\extra\httpd-userdir.conf"
-	copy docs\conf\extra\httpd-mpm.conf.in "$(INSTDIR)\conf\original\httpd-mpm.conf" <.y
+	copy docs\conf\extra\httpd-mpm.conf.in "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" <.y
 	-awk -f <<script.awk "docs/conf/extra/httpd-mpm.conf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\original\extra\httpd-mpm.conf"
     BEGIN { 
 	serverroot = ARGV[2];
@@ -780,16 +780,16 @@ 
 <<
 	if not exist "$(INSTDIR)\conf\extra\httpd-mpm.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-mpm.conf" "$(INSTDIR)\conf\extra\httpd-mpm.conf"
-	copy docs\conf\extra\httpd-default.conf.in "$(INSTDIR)\conf\original\httpd-default.conf" <.y
+	copy docs\conf\extra\httpd-default.conf.in "$(INSTDIR)\conf\original\extra\httpd-default.conf" <.y
 	if not exist "$(INSTDIR)\conf\extra\httpd-default.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-default.conf" "$(INSTDIR)\conf\extra\httpd-default.conf"
-	copy docs\conf\extra\httpd-info.conf.in "$(INSTDIR)\conf\original\httpd-info.conf" <.y
+	copy docs\conf\extra\httpd-info.conf.in "$(INSTDIR)\conf\original\extra\httpd-info.conf" <.y
 	if not exist "$(INSTDIR)\conf\extra\httpd-info.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-info.conf" "$(INSTDIR)\conf\extra\httpd-info.conf"
-	copy docs\conf\extra\httpd-languages.conf.in "$(INSTDIR)\conf\original\httpd-languages.conf" <.y
+	copy docs\conf\extra\httpd-languages.conf.in "$(INSTDIR)\conf\original\extra\httpd-languages.conf" <.y
 	if not exist "$(INSTDIR)\conf\extra\httpd-languages.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-languages.conf" "$(INSTDIR)\conf\extra\httpd-languages.conf"
-	copy docs\conf\extra\httpd-vhosts.conf.in "$(INSTDIR)\conf\original\httpd-vhosts.conf" <.y
+	copy docs\conf\extra\httpd-vhosts.conf.in "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" <.y
 	if not exist "$(INSTDIR)\conf\extra\httpd-vhosts.conf" \
 	    copy "$(INSTDIR)\conf\original\extra\httpd-vhosts.conf" "$(INSTDIR)\conf\extra\httpd-vhosts.conf"
 	-awk -f <<script.awk "support/dbmmanage.in" >"$(INSTDIR)\bin\dbmmanage.pl"