aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorK. Richard Pixley <rich@cygnus>1991-05-27 20:54:50 +0000
committerK. Richard Pixley <rich@cygnus>1991-05-27 20:54:50 +0000
commit6c18e39366ff442912ba8ae828f73ad2d7a7e4d4 (patch)
tree5eb111ec14e45aba325d9c05a1f8a6f49ece0eff /binutils
parent1fb48a6c68bff7917008d44eefd15affc0df346b (diff)
downloadgdb-6c18e39366ff442912ba8ae828f73ad2d7a7e4d4.zip
gdb-6c18e39366ff442912ba8ae828f73ad2d7a7e4d4.tar.gz
gdb-6c18e39366ff442912ba8ae828f73ad2d7a7e4d4.tar.bz2
fixed a bug in multiple targets
Diffstat (limited to 'binutils')
-rwxr-xr-xbinutils/configure79
1 files changed, 54 insertions, 25 deletions
diff --git a/binutils/configure b/binutils/configure
index b354c13..d033ebc 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.