aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Gilmore <gnu@cygnus>1991-07-06 04:35:51 +0000
committerJohn Gilmore <gnu@cygnus>1991-07-06 04:35:51 +0000
commit391e5612c626d37504c2f08c0b6319ba18b2e1c7 (patch)
tree8f7c6daca5d92fc8060b5592e0e1f181d9e4a8f2
parentca18a446bc0f1f97f3e5eb0921b13ebbdecbb333 (diff)
downloadgdb-391e5612c626d37504c2f08c0b6319ba18b2e1c7.zip
gdb-391e5612c626d37504c2f08c0b6319ba18b2e1c7.tar.gz
gdb-391e5612c626d37504c2f08c0b6319ba18b2e1c7.tar.bz2
Fix bug in configure when iterating targets.
Depend on alldeps.mak, not ${srcdir}/alldeps.mak, so it can be found in either spot.
-rwxr-xr-xgdb/configure24
1 files changed, 10 insertions, 14 deletions
diff --git a/gdb/configure b/gdb/configure
index e52fc6a..03ad63e 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -294,6 +294,8 @@ for host in ${hosts} ; do
defaulttargets=true
fi
+ host_makefile_frag=config/hmake-${host}
+
#### configure.in per-host parts come in here.
if [ ! -f xconfig/${host} ]; then
@@ -313,6 +315,8 @@ hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <xconfig/$host`
echo " target=\"${target}\""
fi
+ target_makefile_frag=config/tmake-${target}
+
#### configure.in per-target parts come in here.
if [ ! -f tconfig/${target} ]; then
@@ -479,15 +483,6 @@ fi
# add "Makefile.in" (or whatever it's called)
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
@@ -510,10 +505,6 @@ fi
mv Makefile.tem ${Makefile}
fi
- # Remove all formfeeds, since some Makes get confused by them.
- sed "s/ //" ${Makefile} >> Makefile.tem
- mv Makefile.tem ${Makefile}
-
# reset SUBDIRS
sed "s:^SUBDIRS =.*$:SUBDIRS = ${configdirs}:" ${Makefile} > Makefile.tem
mv Makefile.tem ${Makefile}
@@ -668,7 +659,12 @@ exit 0
#
# $Log$
-# Revision 1.8 1991/07/05 00:04:58 gnu
+# Revision 1.9 1991/07/06 04:35:51 gnu
+# Fix bug in configure when iterating targets.
+# Depend on alldeps.mak, not ${srcdir}/alldeps.mak, so it can be found
+# in either spot.
+#
+# Revision 1.8 1991/07/05 00:04:58 gnu
# Thu Jul 4 14:47:06 1991 John Gilmore (gnu at cygint.cygnus.com)
#
# * configure.in, Makefile.in: Avoid rebuilding "depend" as much.