diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-07 16:30:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-07 16:30:04 +0000 |
| commit | b785f8c1448adccaee9c91eff1f4a9498b7d4132 (patch) | |
| tree | 8cc4fee23cb0e426db3a073e5d73933c4a5d12a1 /odk/configure.pl | |
| parent | 3d840f6f9559a6a90d8c22b72e99921506b8a39e (diff) | |
INTEGRATION: CWS accanonical (1.8.36); FILE MERGED
2005/02/01 16:57:48 rene 1.8.36.2: RESYNC: (1.8-1.9); FILE MERGED
2005/01/21 10:35:33 rene 1.8.36.1: #i39684# remove uname from odk
Diffstat (limited to 'odk/configure.pl')
| -rw-r--r-- | odk/configure.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/odk/configure.pl b/odk/configure.pl index bd3db79342ee..e6e373976920 100644 --- a/odk/configure.pl +++ b/odk/configure.pl @@ -9,7 +9,7 @@ use IO::File; $main::OO_SDK_NAME=readSDKName(); $main::currentWorkingDir = `pwd`; chop ($main::currentWorkingDir); -$main::operatingSystem = `uname -s`; +$main::operatingSystem = `./config.guess | cut -d"-" -f3,4`; chop ($main::operatingSystem); $main::OO_SDK_HOME = ""; $main::OO_SDK_HOME_SUGGESTION = $main::currentWorkingDir; @@ -54,7 +54,7 @@ $main::zipVersion = "2.3"; $main::OO_SDK_CPP_HOME = ""; $main::cppName = "gcc"; $main::cppVersion = "3.0.1"; -if ( $main::operatingSystem eq "SunOS" ) +if ( $main::operatingSystem =~ m/solaris/ ) { $main::cppName = "CC"; $main::cppVersion = "5.2"; |