From cdd82fcf8e44f9284c192dca97de3e9814d22816 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Wed, 3 Jan 2007 09:14:12 +0000
Subject: INTEGRATION: CWS cloph05 (1.7.6); FILE MERGED 2006/12/21 14:08:57
cloph 1.7.6.1: Issue number: #i#72840# without gnucp also when copying
mozilla-files...
---
moz/extractfiles.mk | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index ed605cbbc1de..64264e6a05c9 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: extractfiles.mk,v $
#
-# $Revision: 1.7 $
+# $Revision: 1.8 $
#
-# last change: $Author: kz $ $Date: 2006-10-05 11:06:28 $
+# last change: $Author: hr $ $Date: 2007-01-03 10:14:12 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -205,7 +205,7 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip
.ENDIF
# copy files in COMPONENT_RUNTIMELIST
- +$(foreach,file,$(COMPONENT_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) \
+ +$(foreach,file,$(COMPONENT_RUNTIMELIST) $(COPY) $(MOZ_BIN_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) \
$(RUNTIME_DIR)$/components$/$(DLLPRE)$(file)$(DLLPOST) &&) \
echo >& $(NULLDEV)
@@ -247,8 +247,8 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h
+$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR)
.ELSE
.IF "$(OS)"!="SOLARIS"
- +$(GNUCOPY) -prL $(INCLUDE_PATH)* $(INCLUDE_DIR)
- +$(GNUCOPY) -prL $(PUBLIC_PATH)* $(INCLUDE_DIR)
+ +$(GNUCOPY) -pRL $(INCLUDE_PATH)* $(INCLUDE_DIR)
+ +$(GNUCOPY) -pRL $(PUBLIC_PATH)* $(INCLUDE_DIR)
.ELSE # "$(OS)"!="SOLARIS"
+$(COPY) -pr $(INCLUDE_PATH)* $(INCLUDE_DIR)
+$(COPY) -pr $(PUBLIC_PATH)* $(INCLUDE_DIR)
--
cgit