From 98cc50509619f1192a03c0d8f57eebc85cb80a29 Mon Sep 17 00:00:00 2001
From: Bruce Korb <autogen@linuxbox.com>
Date: Wed, 8 Sep 1999 14:08:26 +0000
Subject: [PATCH] Hapless User Hint for gperf

From-SVN: r29207
---
 gcc/ChangeLog        | 8 ++++++++
 gcc/Makefile.in      | 7 +++++--
 gcc/ch/Makefile.in   | 5 ++++-
 gcc/cp/Makefile.in   | 5 ++++-
 gcc/java/Makefile.in | 5 ++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f878d5af144..9aef07df0d4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+1999-09-08  Bruce Korb  autogen@linuxbox.com
+
+	* gcc/ch/Makefile.in: Give the hapless gperf user a hint about
+	why "gperf -F" fails.
+	* gcc/cp/Makefile.in: ditto
+	* gcc/Makefile.in: ditto
+	* gcc/java/Makefile.in: ditto
+
 Wed Sep  8 04:43:22 1999  Richard Henderson  <rth@cygnus.com>
 
 	* lists.c: Include ggc.h.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6ce461c4f08..bc31b3d5b19 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1337,7 +1337,10 @@ $(srcdir)/c-parse.y: c-parse.in
 
 $(srcdir)/c-gperf.h: c-parse.gperf
 	gperf -L C -F ', 0, 0' -p -j1 -i 1 -g -o -t -G -N is_reserved_word \
-	   -k1,3,$$ $(srcdir)/c-parse.gperf >tmp-gperf.h
+	   -k1,3,$$ $(srcdir)/c-parse.gperf >tmp-gperf.h || ( \
+	echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+	echo "	ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+	exit 1 )
 	 $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h
 
 c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h ggc.h \
@@ -2194,7 +2197,7 @@ stmp-fixinc: fixinc.sh gsyslimits.h
 	  if [ -d $(libdir)/gcc-lib/$(target_alias) ] ; then true ; else mkdir $(libdir)/gcc-lib/$(target_alias) ; fi; \
 	  if [ -d $(libdir)/gcc-lib/$(target_alias)/$(version) ] ; then true ; else mkdir $(libdir)/gcc-lib/$(target_alias)/$(version) ; fi; \
 	else true; fi
-
+	exit 1
 	touch stmp-fixinc
 
 # Files related to the fixproto script.
diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in
index b3779646a1a..3ff898da512 100644
--- a/gcc/ch/Makefile.in
+++ b/gcc/ch/Makefile.in
@@ -254,7 +254,10 @@ $(srcdir)/hash.h:
 	sed -f sed.tmp < gperf.tmp > gperf.tmp2
 	cat $(srcdir)/gperf gperf.tmp2 > gperf.tmp
 	gperf -L C -F ', 0, 0, 0' -D -E -S1 -p -j1 -i 1 -g -o -t -k'*' \
-	  gperf.tmp > $(srcdir)/hash.h
+	  gperf.tmp > $(srcdir)/hash.h || ( \
+	echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+	echo "	ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+	exit 1 )
 	$(RM) gperf.tmp gperf.tmp2 sed.tmp
 
 actions.o : actions.c $(CONFIG_H) $(CHILL_TREE_H) actions.h $(RTL_H)	\
diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index 621567b59d0..7a35d53bcea 100644
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -234,7 +234,10 @@ $(PARSE_C) : $(srcdir)/parse.y
 # so we should be consistent.
 $(srcdir)/hash.h: $(srcdir)/gxx.gperf
 	gperf -L C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word \
-		'-k1,4,7,$$' $(srcdir)/gxx.gperf >$(srcdir)/hash.h
+		'-k1,4,7,$$' $(srcdir)/gxx.gperf >$(srcdir)/hash.h || ( \
+	echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+	echo "	ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+	exit 1 )
 
 spew.o : spew.c $(CONFIG_H) $(CXX_TREE_H) $(PARSE_H) $(srcdir)/../flags.h \
   lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h
diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in
index fe1c51fe67d..07e3c23e087 100644
--- a/gcc/java/Makefile.in
+++ b/gcc/java/Makefile.in
@@ -233,7 +233,10 @@ lang.o: $(srcdir)/java-tree.def
 
 keyword.h: keyword.gperf
 	gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,3,$$ \
-	keyword.gperf > keyword.h
+	keyword.gperf > keyword.h || ( \
+	echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+	echo "	ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+	exit 1 )
 
 jcf-path.o : jcf-path.c $(CONFIG_H) $(srcdir)/../system.h jcf.h
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-- 
2.30.2