From: Jan Engelhardt Date: Tue, 9 Oct 2012 14:27:11 +0200 Subject: doc: revert PDF creation Patch-mainline: Never, temporary workaround Revert 0ecf26fc7d2f24570b4c04a668c437b8656a40a7, since it makes PDF creation fail on SUSE <= 12.2. (cannot find linuxdoc-sgml.sty; seems like /usr/lib/sgml-tool is not in the search path with texlive 2011/suse122.) --- doc/Makefile | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index 0c51872afac5..e7514e4c3c9a 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -6,7 +6,7 @@ PSFILES=ip-cref.ps ip-tunnels.ps api-ip6-flowlabels.ps ss.ps nstat.ps arpd.ps rt LATEX=latex DVIPS=dvips -SGML2DVI=sgml2latex +SGML2DVI=sgml2latex --output=dvi SGML2HTML=sgml2html -s 0 LPR=lpr -Zsduplex SHELL=bash @@ -31,11 +31,8 @@ pdf: $(PDFFILES) print: $(PSFILES) $(LPR) $(PSFILES) -%.tex: %.sgml - $(SGML2DVI) --output=tex $< - %.dvi: %.sgml - $(SGML2DVI) --output=dvi $< + $(SGML2DVI) $< %.dvi: %.tex @set -e; pass=2; echo "Running LaTeX $<"; \ @@ -47,17 +44,10 @@ print: $(PSFILES) echo "Re-running LaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ done -%.pdf: %.tex - @set -e; pass=2; echo "Running pdfLaTeX $<"; \ - while [ `pdflatex $< &1 | \ - grep -c '^\(LaTeX Warning: Label(s) may\|No file \|! Emergency stop\)'` -ge 1 ]; do \ - if [ $$pass -gt 3 ]; then \ - echo "Seems, something is wrong. Try by hands." ; exit 1 ; \ - fi; \ - echo "Re-running pdfLaTeX $<, $${pass}d pass"; pass=$$[$$pass + 1]; \ - done -#%.pdf: %.ps -# ps2pdf $< +#%.pdf: %.tex +# pdflatex $< +%.pdf: %.ps + ps2pdf $< %.ps: %.dvi $(DVIPS) $< -o $@ -- 2.14.1