diff options
| -rw-r--r-- | gdb/ChangeLog | 9 | ||||
| -rwxr-xr-x | gdb/configure | 16 | ||||
| -rw-r--r-- | gdb/configure.in | 17 |
3 files changed, 30 insertions, 12 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 582eb76..08e2467 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +Sat May 27 23:54:17 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in: Use sed instead of awk to get the values of + hostfile, targetfile and nativefile. Awk is not a utility + required by the GNU coding standards. This change also + fixes the rigid whitespace requirements that were required + for awk. + * configure: regenerated. + Sat May 27 16:24:04 1995 Angela Marie Thomas <angela@cirdan.cygnus.com> * sparclite/{Makefile,configure}.in: Add hooks for building with diff --git a/gdb/configure b/gdb/configure index 638fd5d..9c175a0 100755 --- a/gdb/configure +++ b/gdb/configure @@ -1875,23 +1875,27 @@ target_makefile_frag_path=$target_makefile_frag +hostfile=`sed -n ' +s/XM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p +' ${host_makefile_frag}` -# We really shouldn't depend on there being a space after XM_FILE= ... -hostfile=`awk '$1 == "XM_FILE=" { print $2 }' ${host_makefile_frag}` - -# We really shouldn't depend on there being a space after TM_FILE= ... -targetfile=`awk '$1 == "TM_FILE=" { print $2 }' ${target_makefile_frag}` +targetfile=`sed -n ' +s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p +' ${target_makefile_frag}` # these really aren't orthogonal true/false values of the same condition, # but shells are slow enough that I like to reuse the test conditions # whenever possible if test "${target}" = "${host}"; then -nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' ${host_makefile_frag}` +nativefile=`sed -n ' +s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p +' ${host_makefile_frag}` else # GDBserver is only useful in a "native" enviroment configdirs=`echo $configdirs | sed 's/gdbserver//'` fi + # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile # (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the # corresponding links. But we have to remove the xm.h files and tm.h diff --git a/gdb/configure.in b/gdb/configure.in index 3764fb0..29c7621 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -433,22 +433,27 @@ AC_SUBST(target_makefile_frag_path) AC_SUBST_FILE(host_makefile_frag) AC_SUBST_FILE(target_makefile_frag) +changequote(,)dnl +hostfile=`sed -n ' +s/XM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p +' ${host_makefile_frag}` -# We really shouldn't depend on there being a space after XM_FILE= ... -hostfile=`awk '$1 == "XM_FILE=" { print $2 }' ${host_makefile_frag}` - -# We really shouldn't depend on there being a space after TM_FILE= ... -targetfile=`awk '$1 == "TM_FILE=" { print $2 }' ${target_makefile_frag}` +targetfile=`sed -n ' +s/TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p +' ${target_makefile_frag}` # these really aren't orthogonal true/false values of the same condition, # but shells are slow enough that I like to reuse the test conditions # whenever possible if test "${target}" = "${host}"; then -nativefile=`awk '$1 == "NAT_FILE=" { print $2 }' ${host_makefile_frag}` +nativefile=`sed -n ' +s/NAT_FILE[ ]*=[ ]*\([^ ]*\)/\1/p +' ${host_makefile_frag}` else # GDBserver is only useful in a "native" enviroment configdirs=`echo $configdirs | sed 's/gdbserver//'` fi +changequote([,]) # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile # (NAT_FILE) is not set in config/*/*.m[ht] files, we don't make the |