* Rename remote-es1800.c to remote-es.c

[deliverable/binutils-gdb.git] / configure

diff --git a/configure b/configure
index ff27ec651e5ccb51bf4340f4b7d33c20b30bc860..4c2132bc66a307378c2547783d507af8ec9fe91f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+### WARNING: this file contains embedded tabs.  Do not run untabify on this file.
+
 # Configuration script
 #   Copyright (C) 1988, 1990-1993 Free Software Foundation, Inc.
 
@@ -130,8 +132,10 @@ do
                 next_program_suffix=
         elif [ -n "${next_program_transform_name}" ] ; then
                 # Double any backslashes or dollar signs in the argument
-                program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
-                program_transform_nameoption="${program_transform_nameoption} -program_transform_name='${arg}'"
+               if [ -n "${arg}" ] ; then
+                       program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
+               fi
+                program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'"
                 next_program_transform_name=
         elif [ -n "${next_target}" ] ; then
                 next_target=
@@ -204,9 +208,12 @@ do
                         next_program_suffix=yes
                         ;;
                 -program_transform_name=* | --program_transform_name=* | --program_transform_nam=* | --program_transform_na=* | --program_transform_n=* | --program_transform_=* | --program_transform=* | --program_transfor=* | --program_transfo=* | --program_transf=* | --program_trans=* | --program_tran=* | --program_tra=* | --program_tr=* | --program_t=* | -program-transform-name=* | --program-transform-name=* | --program-transform-nam=* | --program-transform-na=* | --program-transform-n=* | --program-transform-=* | --program-transform=* | --program-transfor=* | --program-transfo=* | --program-transf=* | --program-trans=* | --program-tran=* | --program-tra=* | --program-tr=* | --program-t=*)
+                       arg=`echo ${arg} | sed -e 's/^[-a-z_]*=//'`
                         # Double any \ or $ in the argument
-                        program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/^[-a-z_]*=//' -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
-                        program_transform_nameoption="${program_transform_nameoption} -program_transform_name='`echo ${arg} | sed 's/^[-a-z_]*=//'`'"
+                       if [ -n "${arg}" ] ; then
+                               program_transform_name="${program_transform_name} -e `echo ${arg} | sed -e 's/\\\\/\\\\\\\\/g' -e 's/\\\$/$$/g'`"
+                       fi
+                        program_transform_nameoption="${program_transform_nameoption} --program-transform-name='${arg}'"
                         ;;
                 -program_transform_name | --program_transform_name | --program_transform_nam | --program_transform_na | --program_transform_n | --program_transform_ | --program_transform | --program_transfor | --program_transfo | --program_transf | --program_trans | --program_tran | --program_tra | --program_tr | --program_t | -program-transform-name | --program-transform-name | --program-transform-nam | --program-transform-na | --program-transform-n | --program-transform- | --program-transform | --program-transfor | --program-transfo | --program-transf | --program-trans | --program-tran | --program-tra | --program-tr | --program-t)
                         next_program_transform_name=yes
@@ -322,7 +329,10 @@ case "${fatal}" in
                 if tmp_alias=`${guesssys}` ; then
                         echo "- Looks like this is a ${tmp_alias}" 1>&2
                         host_alias=${tmp_alias}
-                        target_alias=${tmp_alias}
+                       case "${target_alias}" in
+                       "") target_alias=${tmp_alias} ;;
+                       *) ;;
+                       esac
                        arguments="--host=${host_alias} ${arguments}"
                 else
                         echo '- Failed to guess the system type.  You need to tell me.' 1>&2
@@ -519,12 +529,12 @@ if [ ! -r ${srcdir}/${srctrigger} ] ; then
         exit 1
 fi
 
-tooldir="\$(libdir)/${target_alias}"
+tooldir="\$(exec_prefix)/${target_alias}"
 
 if [ "${host_alias}" != "${target_alias}" ] ; then
-    if [ "${program_prefix}" = "" ] ; then
-        if [ "${program_suffix}" = "" ] ; then 
-            if [ "${program_transform_name}" = "" ] ; then
+    if [ "${program_prefixoption}" = "" ] ; then
+        if [ "${program_suffixoption}" = "" ] ; then 
+            if [ "${program_transform_nameoption}" = "" ] ; then
                 program_prefix=${target_alias}- ;
             fi
         fi
@@ -776,20 +786,20 @@ EOF
             # remove any form feeds.
             if [ -z "${subdirs}" ]; then
                 rm -f ${subdir}/Makefile.tem2
-                sed -e "s:^SUBDIRS[         ]*=.*$:SUBDIRS = ${configdirs}:" \
-                    -e "s:^NONSUBDIRS[      ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
+                sed -e "s:^SUBDIRS[    ]*=.*$:SUBDIRS = ${configdirs}:" \
+                    -e "s:^NONSUBDIRS[         ]*=.*$:NONSUBDIRS = ${noconfigdirs}:" \
                     ${subdir}/Makefile.tem > ${subdir}/Makefile.tem2
                 rm -f ${subdir}/Makefile.tem
                 mv ${subdir}/Makefile.tem2 ${subdir}/Makefile.tem
             fi
-            sed -e "s:^prefix[      ]*=.*$:prefix = ${prefix}:" \
-                    -e "s:^exec_prefix[     ]*=.*$:exec_prefix = ${exec_prefix}:" \
-                    -e "s:^srcdir[  ]*=.*$:srcdir = ${makesrcdir}:" \
+            sed -e "s:^prefix[         ]*=.*$:prefix = ${prefix}:" \
+                    -e "s:^exec_prefix[        ]*=.*$:exec_prefix = ${exec_prefix}:" \
+                    -e "s:^srcdir[     ]*=.*$:srcdir = ${makesrcdir}:" \
                     -e "s/\f//" \
-                    -e "s:^program_prefix[  ]*=.*$:program_prefix = ${program_prefix}:" \
-                    -e "s:^program_suffix[  ]*=.*$:program_suffix = ${program_suffix}:" \
-                    -e "s:^program_transform_name[  ]*=.*$:program_transform_name = ${program_transform_name}:" \
-                    -e "s:^tooldir[         ]*=.*$:tooldir = ${tooldir}:" \
+                    -e "s:^program_prefix[     ]*=.*$:program_prefix = ${program_prefix}:" \
+                    -e "s:^program_suffix[     ]*=.*$:program_suffix = ${program_suffix}:" \
+                    -e "s:^program_transform_name[     ]*=.*$:program_transform_name = ${program_transform_name}:" \
+                    -e "s:^tooldir[    ]*=.*$:tooldir = ${tooldir}:" \
                     ${subdir}/Makefile.tem >> ${Makefile}
             # final copy now in ${Makefile}