Commit 6b1d601c authored by Mladen Turk's avatar Mladen Turk
Browse files

Oops. Something went wrong with the merge. 

Use the original ~nf.default.

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

Makefile.win

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ BEGIN { 
	if not exist "$(INSTDIR)\conf\httpd.conf" \

	    copy "$(INSTDIR)\conf\httpd.conf.default" "$(INSTDIR)\conf\httpd.conf"

	for %f in ( docs\conf\extra\*.in ) do ( \

	  copy %f "$(INSTDIR)\conf\extra\%~na.default" <.y && \

	  copy %f "$(INSTDIR)\conf\extra\%~nf.default" <.y && \

	  awk -f <<script.awk "docs/conf/extra/%~nf.in" "$(INSTDIR)" > "$(INSTDIR)\conf\extra\%~nf.default" )

    BEGIN { 

	serverroot = ARGV[2];