Mon Jun 15 23:39:24 1998 Craig Burley <burley@gnu.org>

* Make-lang.in (f/g77.info): Use -f when removing
pre-existing Info files, if any.  (This rm command
can go away once makeinfo has been changed to delete
.info-N files beyond the last one it creates.)
* Make-lang.in ($(srcdir)/f/intdoc.texi): Compile
using $(INCLUDES) macro to get the new hconfig.h
and system.h headers.  [Instead of change below.]

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@20593 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 759e664..581f689 100644 (file)
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,14 @@
+Mon Jun 15 23:39:24 1998  Craig Burley  <burley@gnu.org>
+
+       * Make-lang.in (f/g77.info): Use -f when removing
+       pre-existing Info files, if any.  (This rm command
+       can go away once makeinfo has been changed to delete
+       .info-N files beyond the last one it creates.)
+
+       * Make-lang.in ($(srcdir)/f/intdoc.texi): Compile
+       using $(INCLUDES) macro to get the new hconfig.h
+       and system.h headers.  [Instead of change below.]
+
 1998-16-19  Manfred Hollstein  <manfred@s-direktnet.de>
 
        * Makefile.in ($(srcdir)/f/intdoc.texi): Add $(INCLUDES).

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 721f355..943a59c 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -246,7 +246,7 @@ f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
          *) rm -f lang-f77;; \
        esac
        if [ -f lang-f77 ]; then \
-         rm $(srcdir)/f/g77.info-*; \
+         rm -f $(srcdir)/f/g77.info-*; \
          $(MAKEINFO) -I$(srcdir)/f -o f/g77.info $(srcdir)/f/g77.texi; \
        fi
 
@@ -289,7 +289,7 @@ $(srcdir)/f/intdoc.texi: f/intdoc.c f/intdoc.in f/ansify.c f/intrin.def f/intrin
          $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(INCLUDES) \
           `echo $(srcdir)/f/ansify.c | sed 's,^\./,,'` -o f/ansify; \
          f/ansify < $(srcdir)/f/intdoc.in > f/intdoc.h0 $(srcdir)/f/intdoc.in; \
-         $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -I./f $(INCLUDES) \
+         $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) $(INCLUDES) -I./f \
           `echo $(srcdir)/f/intdoc.c | sed 's,^\./,,'` -o f/intdoc; \
          f/intdoc > $(srcdir)/f/intdoc.texi; \
          rm f/intdoc f/ansify f/intdoc.h0; \