akosut      97/07/21 16:05:28

  Modified:    htdocs/manual  windows.html
               src       Makefile.nt
  Log:
  Change release and debug to apacher and apached, to avoid
  name conflicts with VC++.
  
  Reviewed by: Ben Laurie
  
  Revision  Changes    Path
  1.2       +2 -2      apache/htdocs/manual/windows.html
  
  Index: windows.html
  ===================================================================
  RCS file: /export/home/cvs/apache/htdocs/manual/windows.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -C3 -r1.1 -r1.2
  *** windows.html      1997/07/21 21:26:53     1.1
  --- windows.html      1997/07/21 23:05:26     1.2
  ***************
  *** 94,101 ****
       <code>Makefile.nt</code> file. To compile Apache, simply use one of
       the following commands:
    <ul>
  ! <li><code>nmake /f Makefile.nt release</code>
  ! <li><code>nmake /f Makefile.nt debug</code>
    </ul>
    
    <p>These will both compile Apache. The latter will include debugging
  --- 94,101 ----
       <code>Makefile.nt</code> file. To compile Apache, simply use one of
       the following commands:
    <ul>
  ! <li><code>nmake /f Makefile.nt apacher</code> (release build)
  ! <li><code>nmake /f Makefile.nt apached</code> (debug build)
    </ul>
    
    <p>These will both compile Apache. The latter will include debugging
  
  
  
  1.8       +2 -4      apache/src/Makefile.nt
  
  Index: Makefile.nt
  ===================================================================
  RCS file: /export/home/cvs/apache/src/Makefile.nt,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -C3 -r1.7 -r1.8
  *** Makefile.nt       1997/07/21 19:13:01     1.7
  --- Makefile.nt       1997/07/21 23:05:28     1.8
  ***************
  *** 6,14 ****
    # regex makes delete the appropriate apache.exe. Tacky, but it'll work!
    # Ben, 5 July 97
    
  ! _release: release
  ! 
  ! release:
        cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak
        cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f 
ApacheCore.mak
        cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak
  --- 6,12 ----
    # regex makes delete the appropriate apache.exe. Tacky, but it'll work!
    # Ben, 5 July 97
    
  ! apacher:
        cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak
        cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f 
ApacheCore.mak
        cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak
  ***************
  *** 22,28 ****
        cd nt & set CFG=ApacheModuleUserTrack - Win32 Release& nmake /nologo -f 
ApacheModuleUserTrack.mak
        cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake 
/nologo -f ApacheModuleProxy.mak
    
  ! debug:
        cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak
        cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak
        cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak
  --- 20,26 ----
        cd nt & set CFG=ApacheModuleUserTrack - Win32 Release& nmake /nologo -f 
ApacheModuleUserTrack.mak
        cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake 
/nologo -f ApacheModuleProxy.mak
    
  ! apached:
        cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak
        cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak
        cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak
  
  
  

Reply via email to