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

Gbp-Pq: Name sdk-use-sh-to-call-config-guess.diff

diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index dde3a94cf77375d070ad432f7744c30713b90051..f86a4f04995bd8a8e40d58cf4884789ba51af818 100755 (executable)
--- 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 b721e278f320f3fd58a1ef4a29216b50595f2642..4ab9d6289eab7b0af5d6023a2012dc450853e125 100644 (file)
--- 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