Modify lextest and GNUmakefile so that if the test does fail, the

make doesn't proceed

diff --git a/src/GNUmakefile.in b/src/GNUmakefile.in
index 794104c9983040ca0e0efef30f41656003830a03..97bc9997d07f31c75d82b668b53529d60b60f38c 100644 (file)
--- a/src/GNUmakefile.in
+++ b/src/GNUmakefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.14 1997/05/14 04:46:32 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.15 1997/05/16 01:59:51 scrappy Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -31,6 +31,14 @@ all:
         else true;\
        fi
        $(MAKE) -C lextest all
+       @if test ! -f lextest/lextest; then \
+         echo "";\
+         echo "You have a buggy version of flex.  Read INSTALL and search for flex for a fix.";\
+         echo "";\
+         false;\
+       else \
+         true;\
+       fi
        $(MAKE) -C utils all
        $(MAKE) -C backend all
        $(MAKE) -C libpq all

diff --git a/src/lextest/Makefile b/src/lextest/Makefile
index f95b8aeb5fcd1b27a5149bbe03cbd57caae49930..033629c020e616cbc1bf8c7b181cb8ead5e2bc67 100644 (file)
--- a/src/lextest/Makefile
+++ b/src/lextest/Makefile
@@ -13,7 +13,7 @@ lextest: lextest.c scan.l
        $(CC) -c lex.yy.c
        $(CC) -c lextest.c
        $(CC) -o lextest lex.yy.o lextest.o
-       @echo "If this fails, flex is broken" | lextest || echo "You have a buggy version of flex.  Read INSTALL and search for flex for a fix.";exit
+       @echo "If this fails, flex is broken" | ./lextest || rm -f lextest
 
 clean:
        rm -f lextest lex.yy.c lex.yy.o lextest.o