httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0 Makefile.win
Date Fri, 17 Aug 2001 22:58:40 GMT
wrowe       01/08/17 15:58:40

  Modified:    .        Makefile.win
  Log:
    Bring include and lib targets into line with Unix, and drop the segregated
    lib vs. libexec, since we have (carefully) avoided potential name clashes.
  
  Revision  Changes    Path
  1.67      +14 -13    httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Makefile.win	2001/08/17 21:17:39	1.66
  +++ Makefile.win	2001/08/17 22:58:40	1.67
  @@ -244,10 +244,7 @@
   	-mkdir "$(INSTDIR)\htdocs\manual"
   	-mkdir "$(INSTDIR)\icons"
   	-mkdir "$(INSTDIR)\include"
  -	-mkdir "$(INSTDIR)\include\xml"
  -	-mkdir "$(INSTDIR)\include\pcre"
   	-mkdir "$(INSTDIR)\lib"
  -	-mkdir "$(INSTDIR)\libexec"
   	-mkdir "$(INSTDIR)\logs"
   	-mkdir "$(INSTDIR)\modules"
   #	-mkdir "$(INSTDIR)\proxy"
  @@ -351,16 +348,17 @@
           xcopy docs\manual "$(INSTDIR)\htdocs\manual" /s /d < <<
   A
   <<
  -	xcopy include\*.h "$(INSTDIR)\include" /d < <<
  +	xcopy srclib\pcre\pcre*.h "$(INSTDIR)\include" /d < <<
   A
   <<
  +	copy srclib\apr-util\xml\expat\lib\expat.h "$(INSTDIR)\include"
   	xcopy srclib\apr\include\*.h "$(INSTDIR)\include" /d < <<
   A
   <<
   	xcopy srclib\apr-util\include\*.h "$(INSTDIR)\include" /d < <<
   A
   <<
  -	xcopy srclib\pcre\*.h "$(INSTDIR)\include\pcre" /d < <<
  +	xcopy include\*.h "$(INSTDIR)\include" /d < <<
   A
   <<
           xcopy docs\icons "$(INSTDIR)\icons" /s /d < <<
  @@ -370,14 +368,17 @@
   	copy srclib\apr-util\Lib$(SHORT)\aprutil.lib "$(INSTDIR)\lib"
   	copy srclib\pcre\Lib$(SHORT)\pcre.lib "$(INSTDIR)\lib"
   	copy srclib\pcre\Lib$(SHORT)\pcreposix.lib "$(INSTDIR)\lib"
  -	copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\libexec"
  -	copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\libexec"
  -	copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\libexec"
  -	copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\libexec"
  -	copy $(LONG)\libhttpd.exp "$(INSTDIR)\libexec"
  -	copy $(LONG)\libhttpd.lib "$(INSTDIR)\libexec"
  -	copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\libexec"
  -	copy modules\dav\main\$(LONG)\mod_dav.lib "$(INSTDIR)\libexec"
  +#       ### until we determine if it's safe to change expat>libexpat and xml>expat
  +#       within our cvs tree... at least remain consistent to our naming conventions;
  +	copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib\expat.lib"
  +	copy srclib\apr\$(LONG)\libapr.lib "$(INSTDIR)\lib"
  +	copy srclib\apr\$(LONG)\libapr.exp "$(INSTDIR)\lib"
  +	copy srclib\apr-util\$(LONG)\libaprutil.lib "$(INSTDIR)\lib"
  +	copy srclib\apr-util\$(LONG)\libaprutil.exp "$(INSTDIR)\lib"
  +	copy $(LONG)\libhttpd.exp "$(INSTDIR)\lib"
  +	copy $(LONG)\libhttpd.lib "$(INSTDIR)\lib"
  +	copy modules\dav\main\$(LONG)\mod_dav.exp "$(INSTDIR)\lib"
  +	copy modules\dav\main\$(LONG)\mod_dav.lib "$(INSTDIR)\lib"
   	copy docs\conf\magic "$(INSTDIR)\conf\magic.default"
           if not exist "$(INSTDIR)\conf\magic" \
               copy "$(INSTDIR)\conf\magic.default" "$(INSTDIR)\conf\magic"
  
  
  

Mime
View raw message