get the last worker in a given child initialized properly

[apache] / Makefile.win

diff --git a/Makefile.win b/Makefile.win
index 1990bb97430f994783b341f33a90ad374d84c27e..28757e783202f7d9f4b457471aece6681cac33ab 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -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 \Apache2.0. This can be changed
 # with the INSTDIR macro, for example:
 #
 #   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=\Apache2.0
+!MESSAGE Using default install directory \Apache2.0
 !ENDIF 
 
 !IFNDEF MAKEOPT
@@ -59,17 +62,15 @@ clean:
 _build:
        echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
        cd srclib\apr
-#       aprlibdll creates the dynamic aprlib.dll from the static library project aprlib.dsp
-        $(MAKE) $(MAKEOPT) -f aprlib.mak CFG="aprlib - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f apr.mak CFG="apr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libapr.mak CFG="libapr - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd srclib\apr-util
-#       aprutildll creates the dynamic apr-util.dll from the static library project aprutil.dsp
         $(MAKE) $(MAKEOPT) -f aprutil.mak CFG="aprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f aprutildll.mak CFG="aprutildll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libaprutil.mak CFG="libaprutil - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd srclib\expat-lite
-        $(MAKE) $(MAKEOPT) -f expatlib.mak CFG="expatlib - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        $(MAKE) $(MAKEOPT) -f libexpat.mak CFG="libexpat - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd srclib\pcre
         $(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -80,10 +81,8 @@ _build:
         $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..
-        -del Core$(SHORT)\buildmark.obj
-#       ApacheCoreDll creates the dynamic ApacheCore.dll from the static library project ApacheCore
-        $(MAKE) $(MAKEOPT) -f ApacheCore.mak CFG="ApacheCore - Win32 $(LONG)" RECURSE=0 $(CTARGET)
-        $(MAKE) $(MAKEOPT) -f ApacheCoreDll.mak CFG="ApacheCoreDll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+        -del $(LONG)\buildmark.obj
+        $(MAKE) $(MAKEOPT) -f libhttpd.mak CFG="libhttpd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
         $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd modules\aaa
         $(MAKE) $(MAKEOPT) -f mod_auth_anon.mak CFG="mod_auth_anon - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -210,7 +209,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 << 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];
@@ -224,10 +223,10 @@ A
 <<
        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;
-      } 
+      }
+      print $$0;
     }
 <<