summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2003-12-17 17:45:43 +0000
committerVladimir Glazounov <vg@openoffice.org>2003-12-17 17:45:43 +0000
commit488ebc8cf924537bd4a5eee92e80ca1c7a410df4 (patch)
tree12ae57eee9ad7e3213b252c0b25818cdf5e2ad1b /pyuno
parentb17c5e967bef37efce2fb7933de1c32ed0e570e5 (diff)
INTEGRATION: CWS geordi2q11 (1.4.8); FILE MERGED
2003/12/16 14:04:27 hr 1.4.8.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/source/loader/makefile.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/pyuno/source/loader/makefile.mk b/pyuno/source/loader/makefile.mk
index 6c0b9ea50d02..967f6ae70589 100644
--- a/pyuno/source/loader/makefile.mk
+++ b/pyuno/source/loader/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.5 $
#
-# last change: $Author: hjs $ $Date: 2003-08-18 15:00:37 $
+# last change: $Author: vg $ $Date: 2003-12-17 18:45:43 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -138,7 +138,7 @@ $(DLLDEST)$/%.py: %.py
# The python loader component is linked against libpyuno.dylib,
# which hasn't been delivered yet but dyld needs to know where it is
# so regcomp can load the component.
-$(DLLDEST)$/pyuno_services.rdb : makefile.mk
+$(DLLDEST)$/pyuno_services.rdb : makefile.mk $(DLLDEST)$/$(DLLPRE)$(TARGET)$(DLLPOST)
-rm -f $@ $(DLLDEST)$/pyuno_services.tmp $(DLLDEST)$/pyuno_services.rdb
.IF "$(OS)"=="MACOSX"
+cd $(DLLDEST) && sh -c "DYLD_LIBRARY_PATH=$(DYLD_LIBRARY_PATH):$(OUT)$/lib;export DYLD_LIBRARY_PATH;regcomp -register -r pyuno_services.tmp $(foreach,i,$(COMPONENTS) -c $(i))"