From d6420b5b314f64a3e5e9afdc59e7e8261b600a45 Mon Sep 17 00:00:00 2001
From: Jeffrey A Law <law@cygnus.com>
Date: Thu, 18 Sep 1997 22:06:05 +0000
Subject: [PATCH] * Make-lang.in: Fix merge problems.

From-SVN: r15544
---
 gcc/f/ChangeLog.egcs | 4 ++++
 gcc/f/Make-lang.in   | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gcc/f/ChangeLog.egcs b/gcc/f/ChangeLog.egcs
index 98eccbe3ecf..bddd27ecb7d 100644
--- a/gcc/f/ChangeLog.egcs
+++ b/gcc/f/ChangeLog.egcs
@@ -1,3 +1,7 @@
+Thu Sep 18 16:08:40 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* Make-lang.in: Fix merge problems.
+
 Sun Sep 14 21:01:23 1997  Jeffrey A Law  (law@cygnus.com)
 
         * Make-lang.in: Various changes to build info files
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 32cb4002fd7..bcd1da4d95e 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -524,11 +524,9 @@ f77.mostlyclean:
 	-rm -f f/fini f/f771 f/stamp-str f/str-*.h f/str-*.j f/intdoc f/ansify f/intdoc.h0
 	-cd $(srcdir)/f/runtime; $(MAKE) -f Makefile.in mostlyclean
 f77.clean:
-	-cd $(srcdir)/f/runtime; $(MAKE) -f Makefile.in clean;; \
-	esac
+	-cd $(srcdir)/f/runtime; $(MAKE) -f Makefile.in clean
 f77.distclean:
-	-cd $(srcdir)/f/runtime; $(MAKE) -f Makefile.in distclean;; \
-	esac
+	-cd $(srcdir)/f/runtime; $(MAKE) -f Makefile.in distclean
 	-rm -f f/Makefile
 # like gcc's extraclean, which does clean f/ for us, but not f/gbe,
 # f/runtime, f/runtime/libF77, f/runtime/libI77, and f/runtime/libU77,
@@ -547,7 +545,6 @@ f77.extraclean: f77.distclean
 # realclean is the pre-2.7.0 name for maintainer-clean
 f77.maintainer-clean f77.realclean: f77.distclean
 	-cd $(srcdir)/f/runtime; $(MAKE) -f Makefile.in maintainer-clean;; \
-	esac
 	-rm -f f/g77.info* f/g77.*aux f/TAGS f/BUGS f/INSTALL f/NEWS f/intdoc.texi
 #
 # Stage hooks:
-- 
2.30.2