diff options
| author | Yuri Dario <ydario@apache.org> | 2012-02-16 14:44:11 +0000 |
|---|---|---|
| committer | Yuri Dario <ydario@apache.org> | 2012-02-16 14:44:11 +0000 |
| commit | 0b19c4bf0a16891e3bcbc22847f02149df336664 (patch) | |
| tree | c5ea70f48c1f38290e4e133627556a3132e8c177 /set_soenv.in | |
| parent | df165f3a55be1c59dbec0fde3a5fe8185c88c6ac (diff) | |
i118923 - OS/2 port: updates for configuration system.
Diffstat (limited to 'set_soenv.in')
| -rw-r--r-- | set_soenv.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in index 052256c56f55..920c72843e25 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -147,6 +147,9 @@ $GLIBC = ""; # Whether the platform uses glibc $PROEXT = "@PROEXT@"; $EPM_FLAGS = ""; +# Required for OS/2 macro expansion +my @unixroot='@unixroot'; + # #-------------------------------------------------------------------- # IV. Initialise the warning container and print a note to the user. @@ -839,7 +842,14 @@ if ( $platform =~ m/cygwin|os2/ ) { $JAVA_HOME =~ s/[\s\/]+$//; # remove trailing \n or \/ if there is any. } # 3. shell path. +if ( $platform =~ m/os2/ ) +{ +$OOO_SHELL = 'sh'; +} +else +{ $OOO_SHELL = '@SHELLPATH@'."\/bash"; +} if ( '@STLPORT4@' eq $no_stl ) { @@ -1309,7 +1319,7 @@ elsif ($platform =~ m/os2/) if ( '@ANT_HOME@' ne '' ) { - $PATH .= $ps.'@ANT_HOME@'; + $PATH .= $ps.'@ANT_HOME@/bin'; } # Append old PATH |