From 6c18e39366ff442912ba8ae828f73ad2d7a7e4d4 Mon Sep 17 00:00:00 2001
From: "K. Richard Pixley" <rich@cygnus>
Date: Mon, 27 May 1991 20:54:50 +0000
Subject: [PATCH] fixed a bug in multiple targets
---
bfd/configure | 79 +++++++++++++++++++++++++++++--------------
binutils/configure | 79 +++++++++++++++++++++++++++++--------------
configure | 23 +++++++------
gas/configure | 28 ++++++++++------
ld/configure | 83 ++++++++++++++++++++++++++++++----------------
readline/configure | 27 +++++++++------
6 files changed, 208 insertions(+), 111 deletions(-)
diff --git a/bfd/configure b/bfd/configure
index da3adaf830d..0d2e27b6c44 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -3,6 +3,9 @@
# configure.in and a configure template.
configdirs=
+# the debugger.
+#set -x
+
#!/bin/sh
# Configuration script template
@@ -248,11 +251,15 @@ if [ -n "${template}" ] ; then
fi
for i in ${configdir} ${targetspecificdirs} ; do
- if [ -r $i/configure ] ; then
- (cd $i ;
- ./configure +template=${template} ${verbose})
+ if [ -d $i ] ; then
+ if [ -r $i/configure ] ; then
+ (cd $i ;
+ ./configure +template=${template} ${verbose})
+ else
+ echo No configure script in `pwd`/$i
+ fi
else
- echo No configure script in `pwd`/$i
+ echo Warning: directory $i is missing.
fi
done
done
@@ -274,6 +281,8 @@ for host in ${hosts} ; do
defaulttargets=true
fi
+ host_makefile_frag=config/hmake-${host}
+
#### configure.in per-host parts come in here.
## end of per-host part.
@@ -282,9 +291,11 @@ for host in ${hosts} ; do
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
- echo " "target=\"${target}\"
+ echo host \= \"${host}\", target \= \"${target}\".
fi
+ target_makefile_frag=config/tmake-${target}
+
#### configure.in per-target parts come in here.
files=
@@ -425,18 +436,15 @@ links=
cat ${srcdir}/Makefile.in >> Makefile
# and shake thoroughly.
- host_var_file=hmake-${host}
- target_var_file=tmake-${target}
-
# Conditionalize the makefile for this host.
- if [ -f ${srcdir}/config/${host_var_file} ] ; then
- sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
+ if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+ sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
# Conditionalize the makefile for this target.
- if [ -f ${srcdir}/config/${target_var_file} ] ; then
- sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
+ if [ -f ${srcdir}/${target_makefile_frag} ] ; then
+ sed -e "/^####/ r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
@@ -463,15 +471,15 @@ links=
mv Makefile.tem Makefile
using=
- if [ -f ${srcdir}/config/${host_var_file} ] ; then
- using=" using \"${host_var_file}\""
+ if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+ using=" using \"${host_makefile_frag}\""
fi
- if [ -f ${srcdir}/config/${target_var_file} ] ; then
+ if [ -f ${srcdir}/${target_makefile_frag} ] ; then
if [ -z "${using}" ] ; then
- andusing=" using \"${target_var_file}\""
+ andusing=" using \"${target_makefile_frag}\""
else
- andusing="${using} and \"${target_var_file}\""
+ andusing="${using} and \"${target_makefile_frag}\""
fi
else
andusing=${using}
@@ -531,9 +539,13 @@ for configdir in ${configdirs} ; do
done # for each host
if [ -n "${commons}" ] ; then
- (cd ${configdir} ;
- ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
- | sed 's/^/ /'
+ if [ -d ${configdir} ] ; then
+ (cd ${configdir} ;
+ ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
+ | sed 's/^/ /'
+ else
+ echo Warning: directory \"${configdir}\" is missing.
+ fi
fi # if any common hosts
if [ -n "${specifics}" ] ; then
@@ -563,9 +575,13 @@ for configdir in ${configdirs} ; do
fi # if verbose
if [ -n "${commons}" ] ; then
- (cd ${configdir} ;
- ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
- | sed 's/^/ /'
+ if [ -d ${configdir} ] ; then
+ (cd ${configdir} ;
+ ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
+ | sed 's/^/ /'
+ else
+ echo Warning: directory \"${configdir}\" is missing.
+ fi
fi # if any commons
if [ -n "${specifics}" ] ; then
@@ -583,8 +599,21 @@ exit 0
#
# $Log$
-# Revision 1.8 1991/05/14 14:14:25 rich
-# see devo/configure 1.11
+# Revision 1.10 1991/05/27 20:54:38 rich
+# fixed a bug in multiple targets
+#
+# Revision 1.14 1991/05/22 01:44:04 rich
+# remove gdb until config issues resolve.
+#
+# Revision 1.13 1991/05/19 08:00:09 rich
+# Added gdb.
+#
+# Revision 1.12 1991/05/19 00:32:13 rich
+# Changes to deal with missing subdirs gracefully, and changes dictated
+# from dropping configure over gdb.
+#
+# Revision 1.4 1991/05/19 00:16:45 rich
+# Configure for gdb.
#
# Revision 1.10 1991/05/04 00:58:38 rich
# Fix program name bug.
diff --git a/binutils/configure b/binutils/configure
index b354c13fd41..d033ebc1e0f 100755
--- a/binutils/configure
+++ b/binutils/configure
@@ -3,6 +3,9 @@
# configure.in and a configure template.
configdirs=
+# the debugger.
+#set -x
+
#!/bin/sh
# Configuration script template
@@ -248,11 +251,15 @@ if [ -n "${template}" ] ; then
fi
for i in ${configdir} ${targetspecificdirs} ; do
- if [ -r $i/configure ] ; then
- (cd $i ;
- ./configure +template=${template} ${verbose})
+ if [ -d $i ] ; then
+ if [ -r $i/configure ] ; then
+ (cd $i ;
+ ./configure +template=${template} ${verbose})
+ else
+ echo No configure script in `pwd`/$i
+ fi
else
- echo No configure script in `pwd`/$i
+ echo Warning: directory $i is missing.
fi
done
done
@@ -274,6 +281,8 @@ for host in ${hosts} ; do
defaulttargets=true
fi
+ host_makefile_frag=config/hmake-${host}
+
#### configure.in per-host parts come in here.
## end of per-host part.
@@ -282,9 +291,11 @@ for host in ${hosts} ; do
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
- echo " "target=\"${target}\"
+ echo host \= \"${host}\", target \= \"${target}\".
fi
+ target_makefile_frag=config/tmake-${target}
+
#### configure.in per-target parts come in here.
files=
@@ -426,18 +437,15 @@ links=
cat ${srcdir}/Makefile.in >> Makefile
# and shake thoroughly.
- host_var_file=hmake-${host}
- target_var_file=tmake-${target}
-
# Conditionalize the makefile for this host.
- if [ -f ${srcdir}/config/${host_var_file} ] ; then
- sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
+ if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+ sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
# Conditionalize the makefile for this target.
- if [ -f ${srcdir}/config/${target_var_file} ] ; then
- sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
+ if [ -f ${srcdir}/${target_makefile_frag} ] ; then
+ sed -e "/^####/ r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
@@ -464,15 +472,15 @@ links=
mv Makefile.tem Makefile
using=
- if [ -f ${srcdir}/config/${host_var_file} ] ; then
- using=" using \"${host_var_file}\""
+ if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+ using=" using \"${host_makefile_frag}\""
fi
- if [ -f ${srcdir}/config/${target_var_file} ] ; then
+ if [ -f ${srcdir}/${target_makefile_frag} ] ; then
if [ -z "${using}" ] ; then
- andusing=" using \"${target_var_file}\""
+ andusing=" using \"${target_makefile_frag}\""
else
- andusing="${using} and \"${target_var_file}\""
+ andusing="${using} and \"${target_makefile_frag}\""
fi
else
andusing=${using}
@@ -532,9 +540,13 @@ for configdir in ${configdirs} ; do
done # for each host
if [ -n "${commons}" ] ; then
- (cd ${configdir} ;
- ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
- | sed 's/^/ /'
+ if [ -d ${configdir} ] ; then
+ (cd ${configdir} ;
+ ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
+ | sed 's/^/ /'
+ else
+ echo Warning: directory \"${configdir}\" is missing.
+ fi
fi # if any common hosts
if [ -n "${specifics}" ] ; then
@@ -564,9 +576,13 @@ for configdir in ${configdirs} ; do
fi # if verbose
if [ -n "${commons}" ] ; then
- (cd ${configdir} ;
- ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
- | sed 's/^/ /'
+ if [ -d ${configdir} ] ; then
+ (cd ${configdir} ;
+ ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
+ | sed 's/^/ /'
+ else
+ echo Warning: directory \"${configdir}\" is missing.
+ fi
fi # if any commons
if [ -n "${specifics}" ] ; then
@@ -584,8 +600,21 @@ exit 0
#
# $Log$
-# Revision 1.8 1991/05/14 14:14:18 rich
-# see devo/configure 1.11
+# Revision 1.10 1991/05/27 20:54:35 rich
+# fixed a bug in multiple targets
+#
+# Revision 1.14 1991/05/22 01:44:04 rich
+# remove gdb until config issues resolve.
+#
+# Revision 1.13 1991/05/19 08:00:09 rich
+# Added gdb.
+#
+# Revision 1.12 1991/05/19 00:32:13 rich
+# Changes to deal with missing subdirs gracefully, and changes dictated
+# from dropping configure over gdb.
+#
+# Revision 1.4 1991/05/19 00:16:45 rich
+# Configure for gdb.
#
# Revision 1.10 1991/05/04 00:58:38 rich
# Fix program name bug.
diff --git a/configure b/configure
index 6a75d5f36d0..1589aa94efe 100755
--- a/configure
+++ b/configure
@@ -3,6 +3,9 @@
# configure.in and a configure template.
configdirs=
+# the debugger.
+#set -x
+
#!/bin/sh
# Configuration script template
@@ -279,6 +282,8 @@ for host in ${hosts} ; do
defaulttargets=true
fi
+ host_makefile_frag=config/hmake-${host}
+
#### configure.in per-host parts come in here.
## end of per-host part.
@@ -287,11 +292,12 @@ for host in ${hosts} ; do
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
- echo " "target=\"${target}\"
+ echo host \= \"${host}\", target \= \"${target}\".
fi
-#### configure.in per-target parts come in here.
+ target_makefile_frag=config/tmake-${target}
+#### configure.in per-target parts come in here.
## end of per-target part.
# Temporarily, we support only direct subdir builds.
@@ -428,14 +434,6 @@ for host in ${hosts} ; do
cat ${srcdir}/Makefile.in >> Makefile
# and shake thoroughly.
- if [ -z "${host_makefile_frag}" ] ; then
- host_makefile_frag=config/hmake-${host}
- fi
-
- if [ -z "${target_makefile_frag}" ] ; then
- target_makefile_frag=config/tmake-${target}
- fi
-
# Conditionalize the makefile for this host.
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
@@ -599,7 +597,10 @@ exit 0
#
# $Log$
-# Revision 1.14 1991/05/22 01:44:04 rich
+# Revision 1.15 1991/05/27 20:54:24 rich
+# fixed a bug in multiple targets
+#
+# Revision 1.14 1991/05/22 01:44:04 rich
# remove gdb until config issues resolve.
#
# Revision 1.13 1991/05/19 08:00:09 rich
diff --git a/gas/configure b/gas/configure
index 13ebba79ad9..d6b2356daa9 100755
--- a/gas/configure
+++ b/gas/configure
@@ -3,6 +3,9 @@
# configure.in and a configure template.
configdirs=
+# the debugger.
+#set -x
+
#!/bin/sh
# Configuration script template
@@ -278,6 +281,8 @@ for host in ${hosts} ; do
defaulttargets=true
fi
+ host_makefile_frag=config/hmake-${host}
+
#### configure.in per-host parts come in here.
## end of per-host part.
@@ -286,9 +291,11 @@ for host in ${hosts} ; do
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
- echo " "target=\"${target}\"
+ echo host \= \"${host}\", target \= \"${target}\".
fi
+ target_makefile_frag=config/tmake-${target}
+
#### configure.in per-target parts come in here.
# assign cpu type
@@ -481,14 +488,6 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
cat ${srcdir}/Makefile.in >> Makefile
# and shake thoroughly.
- if [ -z "${host_makefile_frag}" ] ; then
- host_makefile_frag=config/hmake-${host}
- fi
-
- if [ -z "${target_makefile_frag}" ] ; then
- target_makefile_frag=config/tmake-${target}
- fi
-
# Conditionalize the makefile for this host.
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
@@ -652,7 +651,16 @@ exit 0
#
# $Log$
-# Revision 1.10 1991/05/19 00:31:35 rich
+# Revision 1.11 1991/05/27 20:54:32 rich
+# fixed a bug in multiple targets
+#
+# Revision 1.14 1991/05/22 01:44:04 rich
+# remove gdb until config issues resolve.
+#
+# Revision 1.13 1991/05/19 08:00:09 rich
+# Added gdb.
+#
+# Revision 1.12 1991/05/19 00:32:13 rich
# Changes to deal with missing subdirs gracefully, and changes dictated
# from dropping configure over gdb.
#
diff --git a/ld/configure b/ld/configure
index 8e25e74f662..ba073e13bee 100755
--- a/ld/configure
+++ b/ld/configure
@@ -3,6 +3,9 @@
# configure.in and a configure template.
configdirs=
+# the debugger.
+#set -x
+
#!/bin/sh
# Configuration script template
@@ -179,7 +182,7 @@ fi
# any existing configure script.
configdirs=
-srctrigger=ldver.c
+srctrigger=ldversion.c
srcname="linker"
## end of common part.
@@ -249,11 +252,15 @@ if [ -n "${template}" ] ; then
fi
for i in ${configdir} ${targetspecificdirs} ; do
- if [ -r $i/configure ] ; then
- (cd $i ;
- ./configure +template=${template} ${verbose})
+ if [ -d $i ] ; then
+ if [ -r $i/configure ] ; then
+ (cd $i ;
+ ./configure +template=${template} ${verbose})
+ else
+ echo No configure script in `pwd`/$i
+ fi
else
- echo No configure script in `pwd`/$i
+ echo Warning: directory $i is missing.
fi
done
done
@@ -275,6 +282,8 @@ for host in ${hosts} ; do
defaulttargets=true
fi
+ host_makefile_frag=config/hmake-${host}
+
#### configure.in per-host parts come in here.
## end of per-host part.
@@ -283,9 +292,11 @@ for host in ${hosts} ; do
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
- echo " "target=\"${target}\"
+ echo host \= \"${host}\", target \= \"${target}\".
fi
+ target_makefile_frag=config/tmake-${target}
+
#### configure.in per-target parts come in here.
## end of per-target part.
@@ -424,18 +435,15 @@ for host in ${hosts} ; do
cat ${srcdir}/Makefile.in >> Makefile
# and shake thoroughly.
- host_var_file=hmake-${host}
- target_var_file=tmake-${target}
-
# Conditionalize the makefile for this host.
- if [ -f ${srcdir}/config/${host_var_file} ] ; then
- sed -e "/^####/ r ${srcdir}/config/${host_var_file}" Makefile > Makefile.tem
+ if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+ sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
# Conditionalize the makefile for this target.
- if [ -f ${srcdir}/config/${target_var_file} ] ; then
- sed -e "/^####/ r ${srcdir}/config/${target_var_file}" Makefile > Makefile.tem
+ if [ -f ${srcdir}/${target_makefile_frag} ] ; then
+ sed -e "/^####/ r ${srcdir}/${target_makefile_frag}" Makefile > Makefile.tem
mv Makefile.tem Makefile
fi
@@ -462,15 +470,15 @@ for host in ${hosts} ; do
mv Makefile.tem Makefile
using=
- if [ -f ${srcdir}/config/${host_var_file} ] ; then
- using=" using \"${host_var_file}\""
+ if [ -f ${srcdir}/${host_makefile_frag} ] ; then
+ using=" using \"${host_makefile_frag}\""
fi
- if [ -f ${srcdir}/config/${target_var_file} ] ; then
+ if [ -f ${srcdir}/${target_makefile_frag} ] ; then
if [ -z "${using}" ] ; then
- andusing=" using \"${target_var_file}\""
+ andusing=" using \"${target_makefile_frag}\""
else
- andusing="${using} and \"${target_var_file}\""
+ andusing="${using} and \"${target_makefile_frag}\""
fi
else
andusing=${using}
@@ -530,9 +538,13 @@ for configdir in ${configdirs} ; do
done # for each host
if [ -n "${commons}" ] ; then
- (cd ${configdir} ;
- ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
- | sed 's/^/ /'
+ if [ -d ${configdir} ] ; then
+ (cd ${configdir} ;
+ ./configure ${commons} ${verbose} ${forcesubdirs} ${removing}) \
+ | sed 's/^/ /'
+ else
+ echo Warning: directory \"${configdir}\" is missing.
+ fi
fi # if any common hosts
if [ -n "${specifics}" ] ; then
@@ -562,9 +574,13 @@ for configdir in ${configdirs} ; do
fi # if verbose
if [ -n "${commons}" ] ; then
- (cd ${configdir} ;
- ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
- | sed 's/^/ /'
+ if [ -d ${configdir} ] ; then
+ (cd ${configdir} ;
+ ./configure ${hosts} ${verbose} ${forcesubdirs} ${removing} ${commons}) \
+ | sed 's/^/ /'
+ else
+ echo Warning: directory \"${configdir}\" is missing.
+ fi
fi # if any commons
if [ -n "${specifics}" ] ; then
@@ -582,12 +598,21 @@ exit 0
#
# $Log$
-# Revision 1.10 1991/05/14 18:53:32 steve
-# Added make dep
-# Made filenames suitable for PCs
+# Revision 1.12 1991/05/27 20:54:42 rich
+# fixed a bug in multiple targets
#
-# Revision 1.9 1991/05/14 14:14:30 rich
-# see devo/configure 1.11
+# Revision 1.14 1991/05/22 01:44:04 rich
+# remove gdb until config issues resolve.
+#
+# Revision 1.13 1991/05/19 08:00:09 rich
+# Added gdb.
+#
+# Revision 1.12 1991/05/19 00:32:13 rich
+# Changes to deal with missing subdirs gracefully, and changes dictated
+# from dropping configure over gdb.
+#
+# Revision 1.4 1991/05/19 00:16:45 rich
+# Configure for gdb.
#
# Revision 1.10 1991/05/04 00:58:38 rich
# Fix program name bug.
diff --git a/readline/configure b/readline/configure
index 23efc6e10fe..1eea1d01256 100755
--- a/readline/configure
+++ b/readline/configure
@@ -3,6 +3,9 @@
# configure.in and a configure template.
configdirs=
+# the debugger.
+#set -x
+
#!/bin/sh
# Configuration script template
@@ -279,6 +282,8 @@ for host in ${hosts} ; do
defaulttargets=true
fi
+ host_makefile_frag=config/hmake-${host}
+
#### configure.in per-host parts come in here.
## end of per-host part.
@@ -287,9 +292,11 @@ for host in ${hosts} ; do
for target in ${targets} ; do
if [ -n "${verbose}" ] ; then
- echo " "target=\"${target}\"
+ echo host \= \"${host}\", target \= \"${target}\".
fi
+ target_makefile_frag=config/tmake-${target}
+
#### configure.in per-target parts come in here.
## end of per-target part.
@@ -428,14 +435,6 @@ for host in ${hosts} ; do
cat ${srcdir}/Makefile.in >> Makefile
# and shake thoroughly.
- if [ -z "${host_makefile_frag}" ] ; then
- host_makefile_frag=config/hmake-${host}
- fi
-
- if [ -z "${target_makefile_frag}" ] ; then
- target_makefile_frag=config/tmake-${target}
- fi
-
# Conditionalize the makefile for this host.
if [ -f ${srcdir}/${host_makefile_frag} ] ; then
sed -e "/^####/ r ${srcdir}/${host_makefile_frag}" Makefile > Makefile.tem
@@ -599,8 +598,14 @@ exit 0
#
# $Log$
-# Revision 1.1 1991/05/21 19:55:06 rich
-# Initial revision
+# Revision 1.2 1991/05/27 20:54:50 rich
+# fixed a bug in multiple targets
+#
+# Revision 1.14 1991/05/22 01:44:04 rich
+# remove gdb until config issues resolve.
+#
+# Revision 1.13 1991/05/19 08:00:09 rich
+# Added gdb.
#
# Revision 1.12 1991/05/19 00:32:13 rich
# Changes to deal with missing subdirs gracefully, and changes dictated