]> granicus.if.org Git - apache/commitdiff
Oops. Something went wrong with the merge.
authorMladen Turk <mturk@apache.org>
Tue, 25 Jul 2006 15:29:32 +0000 (15:29 +0000)
committerMladen Turk <mturk@apache.org>
Tue, 25 Jul 2006 15:29:32 +0000 (15:29 +0000)
Use the original ~nf.default.

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

Makefile.win

index df187a57805339cb4a150bce5f4b20dfb4df7bb4..e3dc2513626f772cb24610e0a36359dbb235b979 100644 (file)
@@ -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];