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 Tue, 03 Dec 2002 06:19:51 GMT
wrowe       2002/12/02 22:19:51

  Modified:    .        Tag: APACHE_2_0_BRANCH Makefile.win
  Log:
    Not entirely clear if we should trust iconv or bin/iconv as the target
    path for iconv modules, but here goes.  Backported from 2.1.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.120.2.2 +10 -1     httpd-2.0/Makefile.win
  
  Index: Makefile.win
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/Makefile.win,v
  retrieving revision 1.120.2.1
  retrieving revision 1.120.2.2
  diff -u -r1.120.2.1 -r1.120.2.2
  --- Makefile.win	30 Nov 2002 17:49:36 -0000	1.120.2.1
  +++ Makefile.win	3 Dec 2002 06:19:51 -0000	1.120.2.2
  @@ -177,7 +177,11 @@
   	cd srclib\apr-iconv
   	 $(MAKE) $(MAKEOPT) -f apriconv.mak  CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
   	 $(MAKE) $(MAKEOPT) -f libapriconv.mak  CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)
  -	cd ..\..
  +	 cd ccs
  +	  $(MAKE) $(MAKEOPT) -f Makefile.win BUILD_TYPE=$(SHORT)DD
  +	 cd ..\ces
  +	  $(MAKE) $(MAKEOPT) -f Makefile.win BUILD_TYPE=$(SHORT)DD
  +	cd ..\..\..
   	cd srclib\apr-util\uri
   	 $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak  CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0
$(CTARGET)
   	cd ..\..\..
  @@ -338,6 +342,7 @@
   	echo A >.A
   	-mkdir "$(INSTDIR)"
   	-mkdir "$(INSTDIR)\bin"
  +	-mkdir "$(INSTDIR)\bin\iconv"
   	-mkdir "$(INSTDIR)\cgi-bin"
   	-mkdir "$(INSTDIR)\conf"
   	-mkdir "$(INSTDIR)\error"
  @@ -358,6 +363,8 @@
   	copy $(LONG)\libhttpd.dll "$(INSTDIR)\bin" <.y
   	copy srclib\apr\$(LONG)\libapr.dll "$(INSTDIR)\bin" <.y
   	copy srclib\apr-iconv\$(LONG)\libapriconv.dll "$(INSTDIR)\bin" <.y
  +	copy srclib\apr-iconv\ccs\$(LONG)\*.so "$(INSTDIR)\bin\iconv" <.y
  +	copy srclib\apr-iconv\ces\$(LONG)\*.so "$(INSTDIR)\bin\iconv" <.y
   	copy srclib\apr-util\$(LONG)\libaprutil.dll "$(INSTDIR)\bin" <.y
   	copy modules\aaa\$(LONG)\mod_access.so "$(INSTDIR)\modules" <.y
   	copy modules\aaa\$(LONG)\mod_auth.so "$(INSTDIR)\modules" <.y
  @@ -408,6 +415,8 @@
   	copy srclib\apr\$(LONG)\libapr.pdb "$(INSTDIR)\bin" <.y
   	copy srclib\apr-iconv\$(LONG)\libapriconv.pdb "$(INSTDIR)\bin" <.y
   	copy srclib\apr-util\$(LONG)\libaprutil.pdb "$(INSTDIR)\bin" <.y
  +	copy srclib\apr-iconv\ccs\$(LONG)\*.pdb "$(INSTDIR)\bin\iconv" <.y
  +	copy srclib\apr-iconv\ces\$(LONG)\*.pdb "$(INSTDIR)\bin\iconv" <.y
   	copy modules\aaa\$(LONG)\mod_access.pdb "$(INSTDIR)\modules" <.y
   	copy modules\aaa\$(LONG)\mod_auth.pdb "$(INSTDIR)\modules" <.y
   	copy modules\aaa\$(LONG)\mod_auth_anon.pdb "$(INSTDIR)\modules" <.y
  
  
  

Mime
View raw message