httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: httpd-2.0 InstallBin.dsp Makefile.win
Date Tue, 12 Dec 2000 17:41:48 GMT
wrowe       00/12/12 09:41:47

  Modified:    .        InstallBin.dsp Makefile.win
  Log:
    Changes for correct apr-util.dll lib name, and don't try building into
    the current tree from the workspace.  Also correct commentary.
  
  Revision  Changes    Path
  1.8       +5 -5      httpd-2.0/InstallBin.dsp
  
  Index: InstallBin.dsp
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/InstallBin.dsp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- InstallBin.dsp	2000/12/07 22:40:33	1.7
  +++ InstallBin.dsp	2000/12/12 17:41:44	1.8
  @@ -39,9 +39,9 @@
   # 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 @@
   # 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 
  
  
  
  1.35      +2 -2      httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Makefile.win	2000/12/12 15:54:28	1.34
  +++ Makefile.win	2000/12/12 17:41:44	1.35
  @@ -64,7 +64,7 @@
   	 $(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 @@
   	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
  
  
  

Mime
View raw message