diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/Makefile.in | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 1629218..0937502 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +Fri Aug 4 14:05:57 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (infodir, SER_HARDWIRE): Fix merge problems from + 2000-07-07 Michael Snyder <msnyder@cleaver.cygnus.com>. + Wed Aug 2 21:15:26 2000 Andrew Cagney <cagney@b1.cygnus.com> * gdbarch.sh (EXTRA_STACK_ALIGNMENT_NEEDED): Add. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9d4aa8c..44610ff 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1,5 +1,5 @@ -# Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 -# Free Software Foundation, Inc. +# Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, +# 1998, 1999, 2000 Free Software Foundation, Inc. # This file is part of GDB. @@ -342,7 +342,7 @@ RUNTESTFLAGS= # part of libiberty) a POSIX interface. But at least for now the # host-dependent makefile fragment might need to use something else # besides ser-unix.o -SER_HARDWIRE = ser-unix.o ser-pipe.o +SER_HARDWIRE = @SER_HARDWIRE@ # The `remote' debugging target is supported for most architectures, # but not all (e.g. 960) @@ -368,6 +368,7 @@ ANNOTATE_OBS = annotate.o FLAGS_TO_PASS = \ "prefix=$(prefix)" \ "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ "against=$(against)" \ "AR=$(AR)" \ "AR_FLAGS=$(AR_FLAGS)" \ |