Changes for correct apr-util.dll lib name, and don't try building into

  the current tree from the workspace.  Also correct commentary.

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

diff --git a/InstallBin.dsp b/InstallBin.dsp
index 7365344f478011ff312121ac9c9ffcd242b96e3e..4d7e9eed75507dcbbdb4ac02ddca8d4e7ebc07db 100644 (file)
--- a/InstallBin.dsp
+++ b/InstallBin.dsp
@@ -39,9 +39,9 @@ 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=. 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.exe"
+# PROP Target_File "\Apache.exe"
 # PROP Bsc_Name ""
 # PROP Target_Dir ""
 
@@ -58,10 +58,10 @@ 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=. 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.exe"
-# PROP Bsc_Name ".\apache.bsc"
+# PROP Target_File "\Apache.exe"
+# PROP Bsc_Name ""
 # PROP Target_Dir ""
 
 !ENDIF 

diff --git a/Makefile.win b/Makefile.win
index 06a21f312b3fa7204387f30cd5cff9a146c750e7..a6af224d54278b594058ad85fe35c6fce7b2d420 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -64,7 +64,7 @@ _build:
         $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET)
        cd ..\..
        cd srclib\apr-util
-#       aprlibdll creates the dynamic aprlib.dll from the static library project aprlib.dsp
+#       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)
        cd ..\..
@@ -136,7 +136,7 @@ _install:
        copy Apache$(SHORT)\Apache.exe $(INSTDIR)
        copy Core$(SHORT)\ApacheCore.dll $(INSTDIR)
        copy srclib\apr\$(LONG)\aprlib.dll $(INSTDIR)
-        copy srclib\apr-util\$(LONG)\aprutil.dll $(INSTDIR)
+        copy srclib\apr-util\$(LONG)\apr-util.dll $(INSTDIR)
         copy srclib\expat-lite\$(LONG)\expatlib.dll $(INSTDIR)
         copy modules\aaa\mod_auth_anon$(SHORT)\mod_auth_anon.dll $(INSTDIR)\modules
        copy modules\aaa\mod_auth_dbm$(SHORT)\mod_auth_dbm.dll $(INSTDIR)\modules