Makefile.in ($(parsedir)/gengtype-lex.c): Don't change to $(parsedir), just move...

	* 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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f37210c7a0fc816205f53a15b17666122ad54dab..d720771ec2cd9baff79aaa679eba56ea2a4a5777 100644 (file)
--- 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 57e949a7e8efea74181899bba0d01b523a401f9d..8039bac7911eba7fba707d260a7ff5994efb9d76 100644 (file)
--- 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)