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 2005/02/18 21:32:07 UTC
svn commit: r154340 - httpd/httpd/trunk/Makefile.win
Author: wrowe
Date: Fri Feb 18 12:32:05 2005
New Revision: 154340
URL: http://svn.apache.org/viewcvs?view=rev&rev=154340
Log:
pcre.lib is bound into libhttpd.dll - we no longer need to redistribute
yet another third party lib, while we now have an ap_reg* API exported
and supported by httpd.
Modified:
httpd/httpd/trunk/Makefile.win
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?view=diff&r1=154339&r2=154340
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Fri Feb 18 12:32:05 2005
@@ -104,7 +104,7 @@
!ENDIF
!IF "$(INSTDIR)" == ""
-INSTDIR=\Apache21
+INSTDIR=g:\built\httpd-2.1-$(SHORT)
!ENDIF
!IF "$(SERVERNAME)" == ""
SERVERNAME=localhost
@@ -202,7 +202,6 @@
cd srclib\pcre
$(MAKE) $(MAKEOPT) -f dftables.mak CFG="dftables - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f pcre.mak CFG="pcre - Win32 $(LONG)" RECURSE=0 $(CTARGET)
- $(MAKE) $(MAKEOPT) -f pcreposix.mak CFG="pcreposix - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd server
$(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -615,7 +614,6 @@
xcopy docs\docroot "$(INSTDIR)\htdocs" /d < .a
xcopy docs\icons "$(INSTDIR)\icons" /s /d < .a
xcopy docs\manual "$(INSTDIR)\manual" /s /d < .a
- xcopy srclib\pcre\pcre*.h "$(INSTDIR)\include" /d < .a
xcopy srclib\apr-util\xml\expat\lib\expat.h "$(INSTDIR)\include" /d < .a
xcopy srclib\apr\include\*.h "$(INSTDIR)\include" /d < .a
xcopy srclib\apr-util\include\*.h "$(INSTDIR)\include" /d < .a
@@ -624,10 +622,6 @@
copy srclib\apr\Lib$(SHORT)\apr_src.pdb "$(INSTDIR)\lib" <.y
copy srclib\apr-util\Lib$(SHORT)\aprutil-1.lib "$(INSTDIR)\lib" <.y
copy srclib\apr-util\Lib$(SHORT)\aprutil_src.pdb "$(INSTDIR)\lib" <.y
- copy srclib\pcre\Lib$(SHORT)\pcre.lib "$(INSTDIR)\lib" <.y
- copy srclib\pcre\Lib$(SHORT)\pcre_src.pdb "$(INSTDIR)\lib" <.y
- copy srclib\pcre\Lib$(SHORT)\pcreposix.lib "$(INSTDIR)\lib" <.y
- copy srclib\pcre\Lib$(SHORT)\pcreposix_src.pdb "$(INSTDIR)\lib" <.y
copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml.lib "$(INSTDIR)\lib" <.y
copy srclib\apr-util\xml\expat\lib\Lib$(SHORT)\xml_src.pdb "$(INSTDIR)\lib" <.y
copy srclib\apr\$(LONG)\libapr-1.lib "$(INSTDIR)\lib" <.y
Re: svn commit: r154340 - httpd/httpd/trunk/Makefile.win
Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Icky - yes, I'll fix this :)
At 11:04 PM 2/18/2005, you wrote:
>On Fri, Feb 18, 2005 at 08:32:07PM -0000, wrowe@apache.org wrote:
>http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?view=diff&r1=154339&r2=154340
>=
>> --- httpd/httpd/trunk/Makefile.win (original)
>> +++ httpd/httpd/trunk/Makefile.win Fri Feb 18 12:32:05 2005
>> @@ -104,7 +104,7 @@
>> !ENDIF
>>
>> !IF "$(INSTDIR)" == ""
>> -INSTDIR=\Apache21
>> +INSTDIR=g:\built\httpd-2.1-$(SHORT)
>
>Surely, this chunk shouldn't have sneaked in, right? -- justin
Re: svn commit: r154340 - httpd/httpd/trunk/Makefile.win
Posted by Justin Erenkrantz <ju...@erenkrantz.com>.
On Fri, Feb 18, 2005 at 08:32:07PM -0000, wrowe@apache.org wrote:
> Modified: httpd/httpd/trunk/Makefile.win
> URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?view=diff&r1=154339&r2=154340
> ==============================================================================
> --- httpd/httpd/trunk/Makefile.win (original)
> +++ httpd/httpd/trunk/Makefile.win Fri Feb 18 12:32:05 2005
> @@ -104,7 +104,7 @@
> !ENDIF
>
> !IF "$(INSTDIR)" == ""
> -INSTDIR=\Apache21
> +INSTDIR=g:\built\httpd-2.1-$(SHORT)
> !ENDIF
> !IF "$(SERVERNAME)" == ""
> SERVERNAME=localhost
Surely, this chunk shouldn't have sneaked in, right? -- justin