You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/01/12 04:31:58 UTC
cvs commit: apache-1.3/src InstallBin.dsp makefile.win
wrowe 01/01/11 19:31:58
Modified: src InstallBin.dsp makefile.win
Log:
Build was broken on some pure unixish awks, this fixes.
Obtained from: new-httpd
Submitted by: Roman Neuhauser
Revision Changes Path
1.5 +2 -2 apache-1.3/src/InstallBin.dsp
Index: InstallBin.dsp
===================================================================
RCS file: /home/cvs/apache-1.3/src/InstallBin.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InstallBin.dsp 2000/12/20 23:48:37 1.4
+++ InstallBin.dsp 2001/01/12 03:31:58 1.5
@@ -39,7 +39,7 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache" SHORT=R LONG=Release _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="/Apache" SHORT=R LONG=Release _install"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache\Apache.exe"
# PROP Bsc_Name ""
@@ -58,7 +58,7 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
-# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="\Apache" SHORT=D LONG=Debug _install"
+# PROP Cmd_Line "NMAKE /f makefile.win INSTDIR="/Apache" SHORT=D LONG=Debug _install"
# PROP Rebuild_Opt ""
# PROP Target_File "\Apache\Apache.exe"
# PROP Bsc_Name ""
1.19 +9 -6 apache-1.3/src/makefile.win
Index: makefile.win
===================================================================
RCS file: /home/cvs/apache-1.3/src/makefile.win,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- makefile.win 2000/12/20 23:48:37 1.18
+++ makefile.win 2001/01/12 03:31:58 1.19
@@ -9,16 +9,19 @@
# _cleanr - remove (most) files generated by a Release build
# _cleand - remove (most) files generated by a Debug build
#
-# The default installation directory is \Apache. This can be changed
+# The default installation directory is /Apache. 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,
+# so the server root should be given in forward slashes (quoted),
+# preferably with the drive designation!
!IF "$(INSTDIR)" == ""
-INSTDIR=\Apache
-!MESSAGE Using default install directory \Apache
+INSTDIR=/Apache
+!MESSAGE Using default install directory /Apache
!ENDIF
!IF "$(MAKE)" == "NMAKE"
@@ -191,7 +194,7 @@
copy ..\conf\srm.conf-dist "$(INSTDIR)\conf\srm.default.conf"
if not exist "$(INSTDIR)\conf\srm.conf" \
copy "$(INSTDIR)\conf\srm.default.conf" "$(INSTDIR)\conf\srm.conf"
- awk -f << ..\conf\httpd.conf-dist-win "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)"
+ awk -f <<script.awk ../conf/httpd.conf-dist-win "$(INSTDIR)/conf/httpd.default.conf" "$(INSTDIR)"
BEGIN {
srcfl = ARGV[1];
dstfl = ARGV[2];
@@ -205,7 +208,7 @@
<<
if not exist "$(INSTDIR)\conf\httpd.conf" \
copy "$(INSTDIR)\conf\httpd.default.conf" "$(INSTDIR)\conf\httpd.conf"
- awk -f << 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;