From b58d9e5d039fd6c0da0b7d40a129a2a567ad06c7 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Fri, 3 Nov 1995 16:08:08 +0000 Subject: [PATCH] * configure.in: Before checking for the existence of various files, use sed to filter out "target-". --- ChangeLog | 5 +++++ configure.in | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index bc2d94d4af..71d4a5f3d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 2 23:23:36 1995 Per Bothner + + * configure.in: Before checking for the existence of various files, + use sed to filter out "target-". + Thu Nov 2 13:24:56 1995 Ian Lance Taylor * Makefile.in (DO_X): Split rule to decrease command line length diff --git a/configure.in b/configure.in index ff16a8237d..94f88867df 100644 --- a/configure.in +++ b/configure.in @@ -52,7 +52,7 @@ target_libs="target-libiberty target-libgloss target-newlib target-libio target- # list belongs in this list. those programs are also very likely # candidates for the "native_only" list which follows # -target_tools="examples groff" +target_tools="target-examples target-groff" ################################################################################ @@ -64,9 +64,9 @@ target_tools="examples groff" # directories to be built in the native environment only # -native_only="autoconf cvs emacs emacs19 fileutils find grep groff gzip hello +native_only="autoconf cvs emacs emacs19 fileutils find grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils gash - uudecode wdiff gprof" + uudecode wdiff gprof target-groff" # directories to be built in a cross environment only # @@ -513,9 +513,11 @@ esac notsupp="" for dir in . $skipdirs $noconfigdirs ; do + dirname=`echo $dir | sed -e s/target-//g` if [ $dir != . ] && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"` - if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then + if [ -r $srcdir/$dirname/configure ] \ + || [ -r $srcdir/$dirname/configure.in ]; then if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then true else @@ -525,7 +527,8 @@ for dir in . $skipdirs $noconfigdirs ; do fi if [ $dir != . ] && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"` - if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then + if [ -r $srcdir/$dirname/configure ] \ + || [ -r $srcdir/$dirname/configure.in ]; then if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then true else @@ -539,7 +542,7 @@ done # libraries. In that case, we don't want to build target-libiberty. if [ -n "${target_configdirs}" ]; then others= - for i in ${target_configdirs}; do + for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do if [ "$i" != "libiberty" ]; then if [ -r $srcdir/$i/configure ] || [ -r $srcdir/$i/configure.in ]; then others=yes; @@ -556,12 +559,12 @@ fi # configuration from one where a subdirectory is supported to one where it # is not. if [ -z "${norecursion}" -a -n "${configdirs}" ]; then - for i in ${configdirs} ; do + for i in `echo ${configdirs} | sed -e s/target-//g` ; do rm -f $i/Makefile done fi if [ -z "${norecursion}" -a -n "${target_configdirs}" ]; then - for i in ${target_configdirs} ; do + for i in `echo ${target_configdirs} | sed -e s/target-//` ; do rm -f ${target_subdir}/$i/Makefile done fi