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/wnt.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/wnt.mk')
| -rw-r--r-- | solenv/inc/wnt.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/solenv/inc/wnt.mk b/solenv/inc/wnt.mk index b59ecaf24bad..e4a7fb8f5427 100644 --- a/solenv/inc/wnt.mk +++ b/solenv/inc/wnt.mk @@ -49,7 +49,6 @@ # --- changes for W32-tcsh - should move into settings.mk --- .IF "$(USE_SHELL)"!="4nt" -STARDEP=javadep JAVAC=javac JAVA=java JAVAI!:=java @@ -59,7 +58,6 @@ PATH_SEPERATOR*=; .ENDIF # "$(USE_SHELL)"!="4nt" # --- general WNT settings --- -CLIMAKER*=climaker HC=hc HCFLAGS= @@ -79,3 +77,9 @@ JAVA_RUNTIME=javai_g.lib .ENDIF .ENDIF +.IF "$(USE_SHELL)" == "bash" +AUGMENT_LIBRARY_PATH *= : && \ + PATH=$${{PATH}}:$(SOLARBINDIR:s/://:^"/cygdrive/") +.ELSE +AUGMENT_LIBRARY_PATH *= echos && PATH=%PATH%;$(SOLARBINDIR) && +.ENDIF |