diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2001-01-13 01:50:49 +0000 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2001-01-13 01:50:49 +0000 |
| commit | d552489474300fdb3c35d3bbe21981368b7c9e30 (patch) | |
| tree | 9b3c2de401ac84cc6dbb836750ca1ae038b273a5 | |
| parent | 501a0061f2af61be28e10d245d2630b489dc855e (diff) | |
| download | httpd-d552489474300fdb3c35d3bbe21981368b7c9e30.tar.gz | |
Clearly the last patch is the -wrong- solution for awk... so I'm backing
it out; we need to find another way to help gnu awk users
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87678 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | InstallBin.dsp | 6 | ||||
| -rw-r--r-- | Makefile.win | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/InstallBin.dsp b/InstallBin.dsp index 691cc9ba92..74b211e70c 100644 --- a/InstallBin.dsp +++ b/InstallBin.dsp @@ -39,7 +39,7 @@ CFG=InstallBin - Win32 Debug # PROP Use_Debug_Libraries 0 # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" -# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="/Apache2.0" SHORT=R LONG=Release _install" +# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2.0" SHORT=R LONG=Release _install" # PROP Rebuild_Opt "" # PROP Target_File "\Apache2.0\Apache.exe" # PROP Bsc_Name "" @@ -58,9 +58,9 @@ CFG=InstallBin - Win32 Debug # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" -# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="/Apache2.0" SHORT=D LONG=Debug _install" +# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache2.0" SHORT=D LONG=Debug _install" # PROP Rebuild_Opt "" -# PROP Target_File "/Apache-2.0/Apache.exe" +# PROP Target_File "\Apache-2.0\Apache.exe" # PROP Bsc_Name "" # PROP Target_Dir "" diff --git a/Makefile.win b/Makefile.win index 50a828457e..0444772dd8 100644 --- a/Makefile.win +++ b/Makefile.win @@ -9,10 +9,10 @@ # _cleanr - remove (most) files generated by a Release build # _cleand - remove (most) files generated by a Debug build # -# The default installation directory is /Apache2.0. This can be changed +# The default installation directory is \Apache2.0. This can be changed # with the INSTDIR macro, for example: # -# nmake /f Makefile.win INSTDIR="d:/Program Files/Apache" installr +# nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr # # Note: this does *NOT* change the compiled in default "server root" # Also be aware that certain awk's will not accept backslahed names, @@ -20,8 +20,8 @@ # preferably with the drive designation! !IF "$(INSTDIR)" == "" -INSTDIR=/Apache2.0 -!MESSAGE Using default install directory /Apache2.0 +INSTDIR=\Apache2.0 +!MESSAGE Using default install directory \Apache2.0 !ENDIF !IFNDEF MAKEOPT @@ -213,7 +213,7 @@ A copy docs\conf\mime.types "$(INSTDIR)\conf\mime.types.default" if not exist "$(INSTDIR)\conf\mime.types" \ copy "$(INSTDIR)\conf\mime.types.default" "$(INSTDIR)\conf\mime.types" - awk -f <<script.awk docs/conf/httpd-win.conf "$(INSTDIR)/conf/httpd.default.conf" "$(INSTDIR)" + awk -f <<script.awk "docs\conf\httpd-win.conf" "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)" BEGIN { srcfl = ARGV[1]; dstfl = ARGV[2]; @@ -227,10 +227,10 @@ A << if not exist "$(INSTDIR)\conf\httpd.conf" \ copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf" - awk -f <<script.awk support/dbmmanage >"$(INSTDIR)/bin/dbmmanage.pl" + awk -f <<script.awk "support\dbmmanage" >"$(INSTDIR)\bin\dbmmanage.pl" { if ( $$0 !~ /^#.*-lsdbm/) { gsub( /AnyDBM_File::ISA = qw\(.*\)/, "AnyDBM_File::ISA = qw(SDBM_File)" ); - print $$0; - } + } + print $$0; } << |