diff options
| author | William A. Rowe Jr <wrowe@apache.org> | 2000-12-12 18:41:44 +0100 |
|---|---|---|
| committer | William A. Rowe Jr <wrowe@apache.org> | 2000-12-12 18:41:44 +0100 |
| commit | d3c1d4a666c41fd1df94f6d749aae04aa39453f9 (patch) | |
| tree | cf7f981daf3946509cb3eda10040dca6fa2f42fe | |
| parent | Fix Windows build (diff) | |
| download | apache2-d3c1d4a666c41fd1df94f6d749aae04aa39453f9.tar.xz apache2-d3c1d4a666c41fd1df94f6d749aae04aa39453f9.zip | |
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
| -rw-r--r-- | InstallBin.dsp | 10 | ||||
| -rw-r--r-- | Makefile.win | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/InstallBin.dsp b/InstallBin.dsp index 7365344f47..4d7e9eed75 100644 --- 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 06a21f312b..a6af224d54 100644 --- 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 |