* install.sh (chmodcmd): Set to null if the DST directory already

[deliverable/binutils-gdb.git] / configure

diff --git a/configure b/configure
index 36afd7d25131eb63847f97e4f4283a4e273c5e7b..83a3bf9d908dcc5d6e0db554d4d9187d338116df 100755 (executable)
--- a/configure
+++ b/configure
@@ -573,9 +573,9 @@ esac
 case "${build_alias}" in
 "")
        if result=`${config_shell} ${configsub} ${host_alias}` ; then
-           build_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-           build_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-           build_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+           build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+           build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+           build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
            build=${build_cpu}-${build_vendor}-${build_os}
            build_alias=${host_alias}
        fi
@@ -583,9 +583,9 @@ case "${build_alias}" in
 *)
        if result=`${config_shell} ${configsub} ${build_alias}` ; then
            buildopt="--build=${build_alias}"
-           build_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-           build_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-           build_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+           build_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+           build_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+           build_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
            build=${build_cpu}-${build_vendor}-${build_os}
        else
            echo "Unrecognized build system name ${build_alias}." 1>&2
@@ -600,9 +600,9 @@ else
     echo "Unrecognized host system name ${host_alias}." 1>&2
     exit 1
 fi
-host_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-host_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-host_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+host_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 host=${host_cpu}-${host_vendor}-${host_os}
 
 . ${tmpfile}.hst
@@ -613,9 +613,9 @@ else
     echo "Unrecognized target system name ${target_alias}." 1>&2
     exit 1
 fi
-target_cpu=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-target_vendor=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-target_os=`echo $result | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
+target_cpu=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 target=${target_cpu}-${target_vendor}-${target_os}
 
 . ${tmpfile}.tgt
@@ -673,10 +673,8 @@ fi
 if [ -z "${CC}" -a -r Makefile ]; then
   sed -n -e ':loop
 /\\$/ N
-s/\\$/\\*hpuxsedbug*/
-/\\$/ b loop
-s/\\\*hpuxsedbug\*/\\/g
 s/\\\n//g
+t loop
 /^CC[  ]*=/ s/CC[      ]*=[    ]*\(.*\)/\1/p' < Makefile > Makefile.cc
   CC=`tail -1 Makefile.cc`
   rm -f Makefile.cc
@@ -685,10 +683,8 @@ fi
 if [ -z "${CXX}" -a -r Makefile ]; then
   sed -n -e ':loop
 /\\$/ N
-s/\\$/\\*hpuxsedbug*/
-/\\$/ b loop
-s/\\\*hpuxsedbug\*/\\/g
 s/\\\n//g
+t loop
 /^CXX[         ]*=/ s/CXX[     ]*=[    ]*\(.*\)/\1/p' < Makefile > Makefile.cc
   CXX=`tail -1 Makefile.cc`
   rm -f Makefile.cc
@@ -746,10 +742,8 @@ if [ "${build}" != "${host}" ]; then
     if [ -z "`eval 'echo $'"${var}"`" -a -r Makefile ]; then
       sed -n -e ':loop
 /\\$/ N
-s/\\$/\\*hpuxsedbug*/
-/\\$/ b loop
-s/\\\*hpuxsedbug\*/\\/g
 s/\\\n//g
+t loop
 /^'"${var}"'[  ]*=/ s/'"${var}"'[      ]*=[    ]*\(.*\)/\1/p' \
        < Makefile > Makefile.v
       t=`tail -1 Makefile.v`
@@ -1114,19 +1108,15 @@ EOF
                    -e "/^CC[   ]*=/{
                        :loop1
                        /\\\\$/ N
-                       s/\\\\$/\\\\*hpuxsedbug*/
-                       /\\\\$/ b loop1
-                       s/\\\\\\*hpuxsedbug\\*/\\\\/g
                        s/\\\\\\n//g
+                       t loop1
                        s%^CC[  ]*=.*$%CC = ${CC}%
                        }" \
                    -e "/^CXX[  ]*=/{
                        :loop2
                        /\\\\$/ N
-                       s/\\\\$/\\\\*hpuxsedbug*/
-                       /\\\\$/ b loop2
-                       s/\\\\\\*hpuxsedbug\\*/\\\\/g
                        s/\\\\\\n//g
+                       t loop2
                        s%^CXX[         ]*=.*$%CXX = ${CXX}%
                        }" \
                    -e "s:^SHELL[        ]*=.*$:SHELL = ${config_shell}:" \