diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 15:03:27 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-16 15:05:43 +0200 |
| commit | 9bd221abfb198fcdf51873e91201a2e717331ae0 (patch) | |
| tree | 1db1fd7a3c1145eaa816f191572aadfc0beb9b26 /odk/config | |
| parent | bd968717c9ca5a6fe8347f93014ac0553ec6d19a (diff) | |
config.guess is apparently not supposed to be called directly
(if you look at how it is used by generated configure scripts); this fixes the
inadvertent loss of executable flag in 3379a4d028a77de5a50e305175d80f65560d5688
"Update config.{guess,sub}"
Change-Id: I29b3467970093006c994af63cb5f5bf087831ae6
Diffstat (limited to 'odk/config')
| -rwxr-xr-x | odk/config/configure.pl | 2 | ||||
| -rw-r--r-- | odk/config/setsdkenv_unix.sh.in | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/odk/config/configure.pl b/odk/config/configure.pl index dde3a94cf773..f86a4f04995b 100755 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -34,7 +34,7 @@ $main::OO_MINORVERSION =~ s#[^\d]+(\d).(\d).+#$2#go; $main::OO_SDK_CONFIG_HOME= "$ENV{HOME}/$main::OO_SDK_NAME"; -$main::operatingSystem = `$main::sdkpath/config.guess | cut -d"-" -f3,4`; +$main::operatingSystem = `/bin/sh $main::sdkpath/config.guess | cut -d"-" -f3,4`; chomp ($main::operatingSystem); $main::OO_SDK_HOME = $main::sdkpath; diff --git a/odk/config/setsdkenv_unix.sh.in b/odk/config/setsdkenv_unix.sh.in index b721e278f320..4ab9d6289eab 100644 --- a/odk/config/setsdkenv_unix.sh.in +++ b/odk/config/setsdkenv_unix.sh.in @@ -89,7 +89,7 @@ then fi # Get the operating system. -sdk_platform=`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4` +sdk_platform=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4` # Set the directory name. programdir=program @@ -143,7 +143,7 @@ fi # Set the directory name. case ${sdk_platform} in solaris*) - sdk_proctype=`${OO_SDK_HOME}/config.guess | cut -d"-" -f1` + sdk_proctype=`/bin/sh ${OO_SDK_HOME}/config.guess | cut -d"-" -f1` if [ "${sdk_proctype}" = "sparc" ] then directoryname=solsparc |