diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-10 03:19:06 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-11-10 03:19:06 +0000 |
| commit | 756acdc5d313715b59374700adc8b35cc7e8908d (patch) | |
| tree | 006667d3a72597bbcc3ded67dbc8394f5eef37de | |
| parent | d560621d71fbafe0cd2d96f44c87277442a71b3a (diff) | |
| download | zsh-756acdc5d313715b59374700adc8b35cc7e8908d.tar.gz zsh-756acdc5d313715b59374700adc8b35cc7e8908d.tar.xz zsh-756acdc5d313715b59374700adc8b35cc7e8908d.zip | |
Merge of 23028: use texi2pdf where available.
| -rw-r--r-- | Config/defs.mk.in | 1 | ||||
| -rw-r--r-- | Doc/Makefile.in | 6 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 0bbf17523..a3af5aad9 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -71,6 +71,7 @@ YODL = @YODL@ YODL2TXT = $(YODL)2txt YODL2HTML = $(YODL)2html PDFETEX = @PDFETEX@ +TEXI2PDF = @TEXI2PDF@ # install utility INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/Doc/Makefile.in b/Doc/Makefile.in index af5418f20..336d2bd97 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -95,7 +95,11 @@ pdf: zsh.pdf .PHONY: pdf zsh.pdf: $(sdir)/zsh.texi - PDFTEX=$(PDFETEX) $(TEXI2DVI) --pdf $(sdir)/zsh.texi + if [ x$(TEXI2PDF) != x ]; then \ + $(TEXI2PDF) $(sdir)/zsh.texi; \ + else \ + PDFTEX=$(PDFETEX) $(TEXI2DVI) --pdf $(sdir)/zsh.texi; \ + fi texi: $(sdir)/zsh.texi .PHONY: texi diff --git a/configure.ac b/configure.ac index 19bae8f38..cff334093 100644 --- a/configure.ac +++ b/configure.ac @@ -492,6 +492,7 @@ AC_PROG_LN dnl Check for working ln, for "make install" AC_PROG_EGREP dnl sets $EGREP to grep -E or egrep AC_CHECK_PROGS([YODL], [yodl], [: yodl]) AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex]) +AC_CHECK_PROGS([TEXI2PDF], [texi2pdf], []) AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr]) if test x"$ansi2knr" = xyes && test x"$ANSI2KNR" = x": ansi2knr"; then |