diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-12-06 15:46:14 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-12-06 15:46:14 +0000 |
| commit | ba998bae0d0e810c15972f77c782a601add183d3 (patch) | |
| tree | fd04980cd73e13ff6c6564ece33975294eec3514 /solenv/inc/tg_shl.mk | |
| parent | da3579adfdf2e4fd92932fe4226427bb3c318c2c (diff) | |
INTEGRATION: CWS soli10envfixes (1.116.22); FILE MERGED
2007/12/05 12:59:14 vg 1.116.22.4: #i84079# add switch instead of occasionally re-define it
2007/12/05 12:55:46 vg 1.116.22.3: #i84079# add switch instead of occasionally re-define it
2007/12/05 12:47:22 vg 1.116.22.2: #i84079# add switch instead of occasionally re-define it
2007/11/29 12:00:45 vg 1.116.22.1: #i84079# reduce library paths for checkdll
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index 7d23c332fd24..8c926ea698c7 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -4,9 +4,9 @@ # # $RCSfile: tg_shl.mk,v $ # -# $Revision: 1.116 $ +# $Revision: 1.117 $ # -# last change: $Author: rt $ $Date: 2007-11-07 16:10:17 $ +# last change: $Author: vg $ $Date: 2007-12-06 16:46:14 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -444,8 +444,11 @@ $(SHL$(TNR)TARGETN) : \ @echo "Making: $@.jnilib" @macosx-create-bundle $@ .IF "$(UPDATER)"=="YES" +.IF "$(SOLAR_STLLIBPATH)"!="" +EXTRALIBPATHS+=-L$(SOLAR_STLLIBPATH) +.ENDIF .IF "$(SHL$(TNR)NOCHECK)"=="" - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB) $(SHL$(TNR)TARGETN) + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN) .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF .ELSE # "$(OS)"=="MACOSX" @@ -460,7 +463,7 @@ $(SHL$(TNR)TARGETN) : \ .IF "$(SHL$(TNR)NOCHECK)"=="" -$(RM) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) $(RENAME) $(SHL$(TNR)TARGETN) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) - $(SOLARENV)$/bin$/checkdll.sh -L$(LB) $(SOLARLIB:s/2.6//) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) + $(SOLARENV)$/bin$/checkdll.sh -L$(LB) -L$(SOLARLIBDIR) $(EXTRALIBPATHS) $(SHL$(TNR)TARGETN:d)check_$(SHL$(TNR)TARGETN:f) .ENDIF # "$(SHL$(TNR)NOCHECK)"!="" .ENDIF # "$(UPDATER)"=="YES" .ENDIF # "$(OS)"=="MACOSX" |