diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:03:49 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:03:49 +0000 |
| commit | c48aeb164c709164ffd476a19c43d8acac52268c (patch) | |
| tree | 703d724b232c3bc0c4576576a1d3eab21ed100bf /pyuno | |
| parent | 0cb36e6fa262b9a315a72984939b9f6601aa7bb0 (diff) | |
INTEGRATION: CWS sb71 (1.14.6); FILE MERGED
2007/06/14 14:54:20 sb 1.14.6.1: #i75466# Adapted to new APP|SHLnRPATH.
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/module/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index aed5e6cb9fdf..88ca40a19a89 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: obo $ $Date: 2007-01-25 15:35:42 $ +# last change: $Author: vg $ $Date: 2007-10-15 13:03:49 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -121,7 +121,7 @@ $(DLLDEST)$/%.py: %.py .IF "$(GUI)" == "UNX" $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj .IF "$(OS)" == "LINUX" - @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd + @echo $(LINK) $(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO) $(LINKFLAGSSHLCUI) -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "SOLARIS" @echo ld -G -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "FREEBSD" |