diff options
| author | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2014-09-20 14:43:42 +0300 |
|---|---|---|
| committer | Peter Stephenson <p.w.stephenson@ntlworld.com> | 2014-09-20 19:24:47 +0100 |
| commit | f4aae44162e4b91f14e8f2d09f65ccc4e7c66dd7 (patch) | |
| tree | adde5ebb6d0a5496cfae99468f6bb3631f57e43b | |
| parent | b4c7f0e7d1c99a0356f5e48233ff008916849d1f (diff) | |
| download | zsh-f4aae44162e4b91f14e8f2d09f65ccc4e7c66dd7.tar.gz zsh-f4aae44162e4b91f14e8f2d09f65ccc4e7c66dd7.tar.xz zsh-f4aae44162e4b91f14e8f2d09f65ccc4e7c66dd7.zip | |
33209: allow dummy zsh.texi if yodl not available.
Removes catastrophic make failure so rest of make can finish.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Makefile.in | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 50d0dfc21..d425169db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-09-20 Peter Stephenson <p.w.stephenson@ntlworld.com> + + * Tanu Kaskinen: 33209: Doc/Makefile.in: don't fail + catastrophically when builing zsh.texi if yodl isn't available. + 2014-09-19 Barton E. Schaefer <schaefer@zsh.org> * 33206: Doc/Zsh/mod_computil.yo: fix compdescribe doc diff --git a/Doc/Makefile.in b/Doc/Makefile.in index f4ee0d760..41af4a33e 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -119,8 +119,10 @@ texi: $(sdir)/zsh.texi .PHONY: texi $(sdir)/zsh.texi: version.yo - $(YODL) -o $@ -I$(sdir) -w ztexi.yo version.yo zsh.yo; \ - test -f $@ + case '$(YODL)' in :*) touch $@ ;; *) \ + $(YODL) -o $@ -I$(sdir) -w ztexi.yo version.yo zsh.yo; \ + test -f $@ \ + ;; esac info: zsh.info .PHONY: info |