From 6cbe39f1ef764c9689a18a2e609e5859f3e397be Mon Sep 17 00:00:00 2001 From: Henning Geinitz Date: Wed, 30 Apr 2003 23:12:17 +0000 Subject: [PATCH] Only use latex if available. --- ChangeLog | 1 + doc/Makefile.in | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e60f63629..086db867b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,7 @@ * include/lalloca.h: Don't use builtin alloca on MacOS X. * tools/Makefile.in: Build sane-desc by default. * tools/sane-desc.c: Fixed segfault. + * doc/Makefile.in: Only use latex if available. 2003-04-27 Henning Meier-Geinitz diff --git a/doc/Makefile.in b/doc/Makefile.in index baea38535..f4810aa30 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -60,7 +60,9 @@ READMES = README AUTHORS COPYING ChangeLog LICENSE NEWS PROBLEMS \ README.solaris README.unixware2 README.unixware7 TODO DOCS = backend-writing.txt sane.ps sane.dvi BACKDIRS= canon leo matsushita mustek mustek_usb plustek umax sceptre teco gt68xx -LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS latex +LATEX = TEXINPUTS=$(srcdir):$$TEXINPUTS @LATEX@ +DVIPS = @DVIPS@ +MAKEINDEX = @MAKEINDEX@ DLH = TEXINPUTS=$(srcdir):$$TEXINPUTS dlh MAN2HTML= nroff -man |\ man2html -compress -topm 6 -botm 6 -title $${page} \ @@ -72,6 +74,12 @@ WWW_PATH= /home/httpd/html/sane/ HTML_PAGES = sane-backends.html sane-backends-external.html \ sane-mfgs.html sane-mfgs-external.html +ifeq (@USE_LATEX@,no) +STANDARD = +else +STANDARD = sane.ps +endif + SUBDIRS = $(BACKDIRS) icons figs descriptions descriptions-external DISTFILES = Makefile.in backend-writing.txt descriptions.txt \ @@ -98,7 +106,7 @@ DISTFILES = Makefile.in backend-writing.txt descriptions.txt \ .PHONY: all clean depend dist distclean html html-man install \ install-mostang sane-html uninstall -all: sane.ps $(MANPAGES) html-pages +all: $(STANDARD) $(MANPAGES) html-pages %.1 %.5 %.7: %.man @sed -e 's|@DATADIR@|$(datadir)|g' \ @@ -164,14 +172,14 @@ uninstall: sane.ind: sane.tex net.tex @echo Generating index for sane.ps... @touch sane.ind - @-$(LATEX) $(srcdir)/sane /dev/null && \ - makeindex sane.idx 2>/dev/null + @$(LATEX) $(srcdir)/sane /dev/null && \ + $(MAKEINDEX) sane.idx 2>/dev/null sane.ps: sane.ind @echo Generating sane.ps... - @-$(LATEX) $(srcdir)/sane /dev/null && \ - $(LATEX) $(srcdir)/sane /dev/null && \ - dvips sane.dvi -o sane.ps 2>/dev/null + @$(LATEX) $(srcdir)/sane /dev/null && \ + $(LATEX) $(srcdir)/sane /dev/null && \ + $(DVIPS) sane.dvi -o sane.ps 2>/dev/null sane-html: sane.ind $(DLH) $(srcdir)/sane.tex