# HG changeset patch
# User jwe
# Date 1115921614 0
# Node ID ad44a165950dcc373f14a2412458e92a60a35e3e
# Parent  e965ab89f832e07ed2dfcd2716db1d3ade572698
[project @ 2005-05-12 18:13:34 by jwe]

diff -r e965ab89f832 -r ad44a165950d src/ChangeLog
--- a/src/ChangeLog	Wed May 11 17:47:47 2005 +0000
+++ b/src/ChangeLog	Thu May 12 18:13:34 2005 +0000
@@ -1,3 +1,8 @@
+2005-05-12  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.in (oct-gperf.h): Try harder to cause Make to exit here
+	if gperf is missing or fails to create a valid file.
+
 2005-05-10  John W. Eaton  <jwe@octave.org>
 
 	* lex.l (<MATRIX_START>{SNLCMT}*\]{S}*): If whitespace was gobbled,
diff -r e965ab89f832 -r ad44a165950d src/Makefile.in
--- a/src/Makefile.in	Wed May 11 17:47:47 2005 +0000
+++ b/src/Makefile.in	Thu May 12 18:13:34 2005 +0000
@@ -545,9 +545,14 @@
 
 oct-gperf.h: octave.gperf
 	@echo "making $@ from $<"
-	@$(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash \
-	  $< | $(SED) 's,lookup\[,gperf_lookup[,' > $@-t
-	@$(top_srcdir)/move-if-change $@-t $@
+	@$(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< > $@-t1 \
+	  || (rm -f $@-t1; exit 1)
+	@$(SED) 's,lookup\[,gperf_lookup[,' $@-t1 > $@-t2 || rm -f $@-t2
+	@if [ -s $@-t2 ]; then \
+	  $(top_srcdir)/move-if-change $@-t2 $@; \
+	else \
+	  exit 1; \
+	fi
 
 # How to make a .oct file from a .o file: