diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Config/defs.mk.in | 1 | ||||
| -rw-r--r-- | Doc/Makefile.in | 6 | ||||
| -rw-r--r-- | configure.ac | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index b487f40d3..3c2de7d45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-12-04 Peter Stephenson <pws@csr.com> + * 23028: configure.ac, Config/defs.mk.in, Doc/Makefile.in: + use texi2pdf where available. + * unposted: Doc/Zsh/calsys.yo, Functions/Calendar/age, Functions/Calendar/calendar_add, Functions/Calendar/calendar_scandate: autoload missing in diff --git a/Config/defs.mk.in b/Config/defs.mk.in index c5794aeef..613c502cd 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -73,6 +73,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 c87f79cef..ca1ab2741 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -97,7 +97,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 a7d1ffddd..c7a32eb11 100644 --- a/configure.ac +++ b/configure.ac @@ -516,6 +516,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 |