You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2002/12/03 07:19:37 UTC
cvs commit: httpd-2.0 Makefile.win
wrowe 2002/12/02 22:19:37
Modified: . Makefile.win
Log:
Not entirely clear if we should trust iconv or bin/iconv as the target
path for iconv modules, but here goes.
Revision Changes Path
1.121 +10 -1 httpd-2.0/Makefile.win
Index: Makefile.win
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.win,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- Makefile.win 22 Nov 2002 01:05:22 -0000 1.120
+++ Makefile.win 3 Dec 2002 06:19:36 -0000 1.121
@@ -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 ..\..\..
@@ -345,6 +349,7 @@
echo A >.A
-mkdir "$(INSTDIR)"
-mkdir "$(INSTDIR)\bin"
+ -mkdir "$(INSTDIR)\bin\iconv"
-mkdir "$(INSTDIR)\cgi-bin"
-mkdir "$(INSTDIR)\conf"
-mkdir "$(INSTDIR)\error"
@@ -365,6 +370,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_auth_basic.so "$(INSTDIR)\modules" <.y
copy modules\aaa\$(LONG)\mod_auth_digest.so "$(INSTDIR)\modules" <.y
@@ -422,6 +429,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_auth_basic.pdb "$(INSTDIR)\modules" <.y
copy modules\aaa\$(LONG)\mod_auth_digest.pdb "$(INSTDIR)\modules" <.y
copy modules\aaa\$(LONG)\mod_authn_anon.pdb "$(INSTDIR)\modules" <.y