diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 11:42:47 +0000 |
| commit | 3f6fea0f5286d30adf24769d16e479038839c0c0 (patch) | |
| tree | 7ec545091a9fe34319c0859f8c036768c51b9f35 /moz | |
| parent | 87e27a414485c1b9f30a88d4a80efa4be59ac2ea (diff) | |
CWS-TOOLING: integrate CWS sb104
2009-01-27 13:09:06 +0100 sb r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment
Diffstat (limited to 'moz')
| -rw-r--r-- | moz/extractfiles.mk | 14 | ||||
| -rw-r--r-- | moz/makefile.mk | 6 |
2 files changed, 19 insertions, 1 deletions
diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk index 081871a3b3ff..b63425810435 100644 --- a/moz/extractfiles.mk +++ b/moz/extractfiles.mk @@ -266,7 +266,21 @@ $(MISC)$/build$/so_moz_runtime_files: $(OUT)$/bin$/mozruntime.zip .ENDIF # zip runtime files to mozruntime.zip +.IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" +# regxpcom needs to find libxpcom.so next to itself: +.IF "$(USE_SHELL)"=="bash" + cd $(RUNTIME_DIR) && \ + LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}. \ + .$/regxpcom$(REG_SUBFIX) +.ELSE + cd $(RUNTIME_DIR) && if ($$?LD_LIBRARY_PATH == 1) \ + eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:."' && \ + if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH . && \ + .$/regxpcom$(REG_SUBFIX) +.ENDIF +.ELSE cd $(RUNTIME_DIR) && .$/regxpcom$(REG_SUBFIX) +.ENDIF $(COPY) $(RUNTIME_DIR)$/components$/xpti.dat $(RUNTIME_DIR)$/components$/xptitemp.dat $(RM) $(RUNTIME_DIR)$/regxpcom$(REG_SUBFIX) cd $(RUNTIME_DIR) && zip -r ..$/..$/bin$/mozruntime.zip * diff --git a/moz/makefile.mk b/moz/makefile.mk index 703b3ab08361..0a81119bed29 100644 --- a/moz/makefile.mk +++ b/moz/makefile.mk @@ -45,7 +45,11 @@ TARGET=ooo_mozab .IF "$(PKGCONFIG_ROOT)"!="" PKG_CONFIG:=$(PKGCONFIG_ROOT)$/bin$/pkg-config PKG_CONFIG_PATH:=$(PKGCONFIG_ROOT)$/lib$/pkgconfig -LD_LIBRARY_PATH!:=$(subst,$(SOLARLIBDIR),$(SOLARLIBDIR)$(PATH_SEPERATOR)$(PKGCONFIG_ROOT)$/lib $(LD_LIBRARY_PATH)) +.IF "$(LD_LIBRARY_PATH)"=="" # assume empty implies unset +LD_LIBRARY_PATH!:=$(PKGCONFIG_ROOT)$/lib +.ELSE +LD_LIBRARY_PATH!:=$(LD_LIBRARY_PATH)$(PATH_SEPERATOR)$(PKGCONFIG_ROOT)$/lib +.ENDIF .EXPORT : PKG_CONFIG_PATH PKG_CONFIG LD_LIBRARY_PATH .ENDIF # "$(PKGCONFIG_ROOT)"!="" |