* configure.in: Before checking for the existence of various files,

	use sed to filter out "target-".

1 files changed, 11 insertions, 8 deletions

diff --git a/configure.in b/configure.in
index ff16a82..94f8886 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