diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-07 15:10:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-07 15:10:17 +0000 |
| commit | f6f94097e5290c9ac61ffa7b0e4028e04e16f8c0 (patch) | |
| tree | 9a35d1512eddf8c8f0227d1e8de7c12fdab03228 /solenv/inc/tg_shl.mk | |
| parent | fd8a38a54cc44b72b67981efcbdc17700e03da2e (diff) | |
INTEGRATION: CWS obo18 (1.115.26); FILE MERGED
2007/11/07 10:43:07 obo 1.115.26.1: #i83407# MacOSX use SOLARLIBDIR it supports milestone extension
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 8c8eabd679fb..7d23c332fd24 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.115 $ +# $Revision: 1.116 $ # -# last change: $Author: vg $ $Date: 2007-10-15 12:39:51 $ +# last change: $Author: rt $ $Date: 2007-11-07 16:10:17 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -437,7 +437,7 @@ $(SHL$(TNR)TARGETN) : \ $(SHL$(TNR)VERSIONOBJ) \ `cat /dev/null $(SHL$(TNR)LIBS) | sed s\#$(ROUT)\#$(PRJ)$/$(ROUT)\#g` | tr -s " " "\n" > $(MISC)$/$(@:b).list @echo $(SHL$(TNR)LINKER) $(SHL$(TNR)LINKFLAGS) $(SHL$(TNR)VERSIONMAPPARA) $(LINKFLAGSSHL) -L$(PRJ)$/$(ROUT)$/lib $(SOLARLIB) -o $@ \ - `macosx-dylib-link-list $(PRJNAME) $(SOLARVERSION)$/$(INPATH)$/lib $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \ + `macosx-dylib-link-list $(PRJNAME) $(SOLARLIBDIR) $(PRJ)$/$(INPATH)$/lib $(SHL$(TNR)STDLIBS)` \ $(SHL$(TNR)STDLIBS) $(SHL$(TNR)ARCHIVES) $(SHL$(TNR)STDSHL) $(STDSHL$(TNR)) -filelist $(MISC)$/$(@:b).list $(LINKOUTPUT_FILTER) > $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @cat $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd @+source $(MISC)$/$(TARGET).$(@:b)_$(TNR).cmd |