From b28ac9b5bb75073a1e7d3300a239e75a16d0e391 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Thu, 25 Jan 2007 12:45:43 +0000 Subject: [PATCH] INTEGRATION: CWS ause069 (1.15.44); FILE MERGED 2006/10/18 17:11:53 hjs 1.15.44.1: #i70359# remove forced shell calls --- moz/zipped/makefile.mk | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk index 002c9fdd3453..6a669927101a 100644 --- a/moz/zipped/makefile.mk +++ b/moz/zipped/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.16 $ # -# last change: $Author: rt $ $Date: 2005-09-07 19:59:34 $ +# last change: $Author: obo $ $Date: 2007-01-25 13:45:43 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -64,26 +64,26 @@ ALLTAR: \ .IF "$(GUI)" == "UNX" $(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip $(OS)$(COM)$(CPU)runtime.zip - +unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@ - +chmod -R 775 $(LB) + unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && unzip -o -d $(LB) $(OS)$(COM)$(CPU)runtime.zip && $(TOUCH) $@ + chmod -R 775 $(LB) $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip - +unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@ - +chmod -R 775 $(INCCOM) + unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@ + chmod -R 775 $(INCCOM) .ELSE $(MISC)$/unpacked_$(TARGET)_lib : $(OS)$(COM)$(CPU)lib.zip - +unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \ + unzip -o -d $(LB) $(OS)$(COM)$(CPU)lib.zip && \ $(TOUCH) $@ $(MISC)$/unpacked_$(TARGET)_inc : $(OS)$(COM)$(CPU)inc.zip - +unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@ + unzip -o -d $(INCCOM) $(OS)$(COM)$(CPU)inc.zip && $(TOUCH) $@ .ENDIF $(BIN)$/mozruntime.zip : $(OS)$(COM)$(CPU)runtime.zip - +$(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip + $(COPY) $(OS)$(COM)$(CPU)runtime.zip $(BIN)$/mozruntime.zip .ENDIF # unpack mozab zips