diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-16 18:11:49 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-06-16 18:11:49 +0000 |
| commit | 3d86aa935d3b0733bc55922f7800ddc24bcae173 (patch) | |
| tree | 4ee7a7e4a3f92c2a8c8641d70c4900d3e2526b3f /solenv/inc/unitools.mk | |
| parent | a3cdaf33394e32b6cc3a47a9249b231da79fc39a (diff) | |
CWS-TOOLING: integrate CWS ause102
2009-06-16 19:22:59 +0200 hjs r273039 : #i102607# don't kill mingw
2009-06-12 15:17:22 +0200 ihi r272921 : #i102607# add path before calling l10n tool
2009-06-11 14:25:20 +0200 hjs r272873 : #i102607# on EPM=internal call binary with full path
2009-06-10 13:35:48 +0200 hjs r272807 : #i102607# remove solver PATH entry from OOo env.
2009-06-10 12:10:44 +0200 hjs r272802 : #i102635# correct dependencies for all
2009-06-10 11:58:53 +0200 hjs r272801 : #i102607# call tools from solver with absolute path
Diffstat (limited to 'solenv/inc/unitools.mk')
| -rw-r--r-- | solenv/inc/unitools.mk | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk index f62357808ef6..3da9ed392516 100644 --- a/solenv/inc/unitools.mk +++ b/solenv/inc/unitools.mk @@ -30,14 +30,19 @@ #************************************************************************* # Common tools - move this to the end / consolidate -TRANSEX*=$(AUGMENT_LIBRARY_PATH) transex3 -ULFEX*=$(AUGMENT_LIBRARY_PATH) ulfex -XMLEX*=$(AUGMENT_LIBRARY_PATH) xmlex -XRMEX*=$(AUGMENT_LIBRARY_PATH) xrmex -CFGEX*=$(AUGMENT_LIBRARY_PATH) cfgex +TRANSEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/transex3 +ULFEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfex +XMLEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xmlex +XRMEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xrmex +CFGEX*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/cfgex + +.IF "$(SYSTEM_LIBXSLT)"!="YES" +XSLTPROC*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/xsltproc +.ELSE # "$(SYSTEM_LIBXSLT)"!="YES" XSLTPROC*=$(AUGMENT_LIBRARY_PATH) xsltproc +.ENDIF # "$(SYSTEM_LIBXSLT)"!="YES" -ULFCONV*=$(AUGMENT_LIBRARY_PATH) ulfconv +ULFCONV*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/ulfconv MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/makedepend @@ -228,7 +233,7 @@ GNUTAR*:=tar TAR*:=tar RM+=$(RMFLAGS) -ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) adjustvisibility +ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/adjustvisibility CONVERT*:=$(PERL) $(SOLARENV)$/bin$/leconvert.pl EXECTEST := $(PERL) -w $(SOLARENV)$/bin$/exectest.pl GCCINSTLIB:=$(PERL) -w $(SOLARENV)$/bin$/gccinstlib.pl |