From: Mladen Turk <mturk@apache.org>
Date: Tue, 25 Jul 2006 15:29:32 +0000 (+0000)
Subject: Oops. Something went wrong with the merge.
X-Git-Tag: 2.3.0~2213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c957a9d915b1cd3335920494e740691134390bb;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/Makefile.win b/Makefile.win
index df187a57805..e3dc2513626 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -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];