User: rt Date: 05/03/30 03:35:15 Modified: /dba/connectivity/source/drivers/mozab/mozillasrc/ makefile.mk
Log: INTEGRATION: CWS systemmozilla (1.13.52); FILE MERGED 2005/03/03 13:40:14 rene 1.13.52.3: #i17187# reanimate --disable-mozilla 2005/02/25 03:58:31 rene 1.13.52.2: RESYNC: (1.13-1.14); FILE MERGED 2005/01/06 18:58:32 rene 1.13.52.1: #i17187# use system mozilla ... (patch) File Changes: Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk?r1=1.14&r2=1.15 Delta lines: +2 -2 ------------------- --- makefile.mk 21 Feb 2005 12:33:16 -0000 1.14 +++ makefile.mk 30 Mar 2005 11:35:13 -0000 1.15 @@ -84,12 +84,12 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO" +.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" - + @echo " see http://bugzilla.mozilla.org/show_bug.cgi?id=135137"; .ELSE .INCLUDE : $(PRJ)$/version.mk --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
