Commit f2c326ca authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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
parent 6f43f6d8

InstallBin.dsp

+5 −5
Original line number Diff line number Diff line
@@ -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

Makefile.win

+2 −2
Original line number Diff line number Diff line
@@ -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