diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-07-20 08:48:53 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-07-20 08:48:53 +0000 |
| commit | 1370c921b26b07e170e7a978f7990f0c3f70e593 (patch) | |
| tree | 0a2e84b045b6a34cd5835d57759c92f1ef1775d4 /moz | |
| parent | b686b7eb682f7e78bf6b0aec243a1c7863c8905e (diff) | |
INTEGRATION: CWS mhu09 (1.3.4); FILE MERGED
2005/07/14 15:35:43 hjs 1.3.4.3: #i51415# workaround old gnu-cp in SO SOLARIS env
2005/07/14 13:05:29 hjs 1.3.4.2: #i51415# remove duplicate
2005/07/12 13:24:52 mhu 1.3.4.1: #i51415# (a) Do not let the Sun Studio compiler record it's default RUNPATH (/opt/SUNWspro/...) into shared libraries. Use the compilers -norunpath option instead. (b) Always specify a RUNPATH in shared libraries (Linux and Solaris: '6753ORIGIN' always, and '6753ORIGIN/..' for components).
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/extractfiles.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 16ee69657fbf..2974aeee7ce2 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -2,9 +2,9 @@ # # $RCSfile: extractfiles.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: kz $ $Date: 2005-05-31 17:05:37 $ +# last change: $Author: obo $ $Date: 2005-07-20 09:48:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -111,7 +111,7 @@ COMPONENT_RUNTIMELIST= \ rdf \ uconv \ vcard \ - i18n \ + i18n \ pipnss .IF "$(GUI)"=="WNT" @@ -144,14 +144,12 @@ COMREGISTRY_FILELIST+= xpcom_threads.xpt DEFAULTS_RUNTIMELIST= \ defaults$/pref$/browser-prefs.js \ defaults$/pref$/mailnews.js \ - defaults$/pref$/smime.js \ defaults$/pref$/mdn.js \ - defaults$/pref$/smime.js \ + defaults$/pref$/smime.js \ defaults$/autoconfig$/platform.js \ defaults$/autoconfig$/prefcalls.js \ greprefs$/all.js \ greprefs$/security-prefs.js - .IF "$(GUI)"=="WNT" LIBLIST= \ @@ -275,8 +273,13 @@ $(MISC)$/build$/so_moz_include_files: $(INCCOM)$/nsBuildID.h +$(COPY) /QSZ $(INCLUDE_PATH)* $(INCLUDE_DIR) +$(COPY) /QSZ $(PUBLIC_PATH)* $(INCLUDE_DIR) .ELSE +.IF "$(OS)"!="SOLARIS" +$(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) +.ENDIF # "$(OS)"!="SOLARIS" .ENDIF .IF "$(GUI)"=="UNX" |