Mercurial > hg > octave-lyh
changeset 5350:ad44a165950d
[project @ 2005-05-12 18:13:34 by jwe]
| author | jwe |
|---|---|
| date | Thu, 12 May 2005 18:13:34 +0000 |
| parents | e965ab89f832 |
| children | 05adf9de7657 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -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,
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -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: