summaryrefslogtreecommitdiff
path: root/moz/zipped/makefile.mk
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-03-01 16:20:01 +0000
committerKurt Zenker <kz@openoffice.org>2005-03-01 16:20:01 +0000
commit1a495ae7f61a8f40d624101b6f28614f856bed5c (patch)
tree7acc9fd897f87e4a5a31eddd6b1bf841109d3f65 /moz/zipped/makefile.mk
parent409617eda349bcd59f85e8a6cca54bdf7386792a (diff)
INTEGRATION: CWS mozooo (1.7.52); FILE MERGED
2004/10/29 08:49:14 fs 1.7.52.5: RESYNC: (1.9-1.10); FILE MERGED 2004/03/15 14:29:44 fs 1.7.52.4: RESYNC: (1.7.46.1-1.9); FILE MERGED 2004/01/30 08:56:43 fs 1.7.52.3: RESYNC: (1.7-1.7.46.1); FILE MERGED 2004/01/07 10:22:03 fs 1.7.52.2: #i11424# How could I forget this in the previous comment? Also thanks to Volker Quetschke (vq@openoffice.org) 2004/01/07 10:07:58 fs 1.7.52.1: #i11424# allow for building Mozilla tarballs (needed for Mozilla Address Book integration) during an OOo build thanks to Wind Li (yl146652@openoffice.org)
Diffstat (limited to 'moz/zipped/makefile.mk')
-rw-r--r--moz/zipped/makefile.mk12
1 files changed, 8 insertions, 4 deletions
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index f204a7bd0d60..158109751c11 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.10 $
+# $Revision: 1.11 $
#
-# last change: $Author: kz $ $Date: 2004-08-31 12:44:55 $
+# last change: $Author: kz $ $Date: 2005-03-01 17:20:01 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -77,14 +77,17 @@ dummy:
@echo "Nothing to build for OS $(OS)"
.ELSE "$(OS)" == "MACOSX"
-
.INCLUDE : target.mk
+.IF "$(BUILD_MOZAB)"=="TRUE"
+ALLTAR:
+ @echo "Does not need build mozab zipped!"
+.ELSE
ALLTAR: \
$(MISC)$/unpacked_$(TARGET)_inc \
$(MISC)$/unpacked_$(TARGET)_lib \
$(BIN)$/mozruntime.zip
-
+.ENDIF
.IF "$(GUI)" == "UNX"
$(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip $(OS)$(COM)$(CPU)runtime.zip
@@ -109,5 +112,6 @@ $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip
$(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip
+$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip
+
.ENDIF # "$(OS)" == "MACOSX"