From dcd1c2b8fe5ab482367c4d94a79a4cde04ffd2e1 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Mon, 13 Jan 2003 20:37:28 +0000
Subject: [PATCH] Makefile.in ($(parsedir)/gengtype-lex.c): Don't change to
 $(parsedir), just move the temporary file at the end.

	* Makefile.in ($(parsedir)/gengtype-lex.c): Don't change to
	$(parsedir), just move the temporary file at the end.
	($(parsedir)/gengtype-yacc.c): Likewise.

From-SVN: r61257
---
 gcc/ChangeLog   |  6 ++++++
 gcc/Makefile.in | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f37210c7a0f..d720771ec2c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-13  Andreas Schwab  <schwab@suse.de>
+
+	* Makefile.in ($(parsedir)/gengtype-lex.c): Don't change to
+	$(parsedir), just move the temporary file at the end.
+	($(parsedir)/gengtype-yacc.c): Likewise.
+
 2003-01-13  Alexandre Oliva  <aoliva@redhat.com>
 
 	* aclocal.m4 (gcc_AC_PROG_GNAT): Don't try to prepend
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 57e949a7e8e..8039bac7911 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2111,20 +2111,23 @@ gengtype-yacc.o : $(parsedir)/gengtype-yacc.c gengtype.h $(BCONFIG_H) $(SYSTEM_H
 
 # The sed command works around a bug in flex-2.5.4.
 $(parsedir)/gengtype-lex.c : $(srcdir)/gengtype-lex.l
-	cd $(parsedir) && \
-	$(FLEX) $(FLEXFLAGS) -t -o$@ $(srcdir)/gengtype-lex.l | \
+	$(FLEX) $(FLEXFLAGS) -t -o- $(srcdir)/gengtype-lex.l | \
 	  sed 's/^\(char msg\[\];\)/yyconst \1/' > g-$$$$ ; \
 	if test $$? -eq 0 ; then \
-	  mv -f g-$$$$ gengtype-lex.c ; \
+	  mv -f g-$$$$ $(parsedir)/gengtype-lex.c ; \
 	else \
-	  rm -f g-$$$$.* ; \
+	  rm -f g-$$$$ ; \
 	  false ; \
 	fi
 
 $(parsedir)/gengtype-yacc.c: $(srcdir)/gengtype-yacc.y
-	(cd $(parsedir) && \
-	 $(BISON) $(BISONFLAGS) -d -o gengtype-yacc.c $(srcdir)/gengtype-yacc.y || \
-	 ( rm -f $@ && false ) )
+	if $(BISON) $(BISONFLAGS) -d -o g-yacc.$$$$.c $(srcdir)/gengtype-yacc.y; then \
+	  mv -f g-yacc.$$$$.h $(parsedir)/gengtype-yacc.h; \
+	  mv -f g-yacc.$$$$.c $(parsedir)/gengtype-yacc.c; \
+	else \
+	  rm -f g-yacc.$$$$.*; \
+	  false; \
+	fi
 
 genconditions$(build_exeext) : genconditions.o $(BUILD_EARLY_SUPPORT) \
   $(BUILD_RTL) $(BUILD_ERRORS) $(BUILD_LIBDEPS)
-- 
2.30.2