From d86c4b87f2bc676dd98a91772883c77dcc6cd9b7 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Tue, 3 Dec 2002 06:19:36 +0000 Subject: [PATCH] Not entirely clear if we should trust iconv or bin/iconv as the target path for iconv modules, but here goes. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97762 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.win | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.win b/Makefile.win index a40d988580..bc6af58781 100644 --- a/Makefile.win +++ b/Makefile.win @@ -177,7 +177,11 @@ _build: 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 @@ _install: 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 @@ _install: 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 @@ _install: 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 -- 2.50.1