From 645a5888e857a8f9579d46825d97d8dfa57a79d2 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Thu, 31 Jan 2002 19:51:04 +0000
Subject: [PATCH] tex.mk: Use pdflatex

---
 make/tex.mk | 51 +++++++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/make/tex.mk b/make/tex.mk
index ebaaa9dd..e2734cb6 100644
--- a/make/tex.mk
+++ b/make/tex.mk
@@ -7,6 +7,7 @@
 ifeq ($(TEX_TMPL_DIR), "")
 	TEX_TMPL_DIR = thisisnotadirectory
 endif
+latex = latex
 
 # this is what is there already
 PRE_FIG_LOCAL = $(wildcard *.fig)
@@ -57,7 +58,8 @@ IMAGES = $(patsubst %,$(IMAGEDIR)/%,$(FRONTLOGO_EPS) $(FRONTLOGO_WEB) \
 	$(ICON_UP) $(ICON_PREV) $(ICON_NEXT) $(ICON_INDEX) $(ICON_CONTENTS)) \
 
 #LOCAL_IMPORTED_TEMPLATES = $(notdir $(IMPORTED_TEMPLATES))
-FMT_OFFLINE = tex dvi ps pdf txt
+#FMT_OFFLINE = tex dvi ps pdf txt
+FMT_OFFLINE = tex pdf # txt
 FMT = $(FMT_OFFLINE) html
 OUT = $(DISTDIR)/$(OUTPUT)
 FMT_OUT = $(patsubst %,$(OUT).%.zip,$(FMT))
@@ -193,31 +195,31 @@ dirs: dirs.done
 arch:
 	test $(shell uname -s) = Linux
 
-xdvi: $(LATEX_INPUT)
-	@echo "-- running latex just once ..."
-	latex $(MAIN).tex
-	xdvi $(MAIN).dvi
+#xdvi: $(LATEX_INPUT)
+#	@echo "-- running latex just once ..."
+#	$(latex) $(MAIN).tex
+#	xdvi $(MAIN).dvi
 
 $(OUT).tex.zip: cfgtest $(LATEX_INPUT)
 	@echo "-- creating zipfile with tex source files"
 	zip $@ $(LATEX_INPUT) 2>/dev/null
 
-$(OUTPUT).dvi: $(LATEX_INPUT)
-	@echo "-- creating dvi file"
-	latex $(MAIN).tex; latex $(MAIN).tex; latex $(MAIN).tex;			
-	cp $(MAIN).dvi $@
+#$(OUTPUT).dvi: $(LATEX_INPUT)
+#	@echo "-- creating dvi file"
+#	$(latex) $(MAIN).tex; $(latex) $(MAIN).tex; $(latex) $(MAIN).tex;			
+#	cp $(MAIN).dvi $@
 
-$(OUT).dvi.zip: $(OUTPUT).dvi
-	zip $@ $^
+#$(OUT).dvi.zip: $(OUTPUT).dvi
+#	zip $@ $^
 
-$(OUTPUT).txt: $(OUTPUT).dvi
-	@echo "-- creating plain ascii file"
-	dvi2tty $< -w100 -o $@
+#$(OUTPUT).txt: $(OUTPUT).dvi
+#	@echo "-- creating plain ascii file"
+#	dvi2tty $< -w100 -o $@
 
-$(OUT).txt.zip: $(OUTPUT).txt
-	zip $@ $<
+#$(OUT).txt.zip: $(OUTPUT).txt
+#	zip $@ $<
 
-$(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT) tex dvi ps txt pdf 
+$(HTMLDIR): $(LATEX_INPUT) $(HTML_INPUT) tex pdf # txt ps dvi
 	test $(MAIN) != index
 	rm -rf $@
 	mkdir -p $@
@@ -242,16 +244,17 @@ $(OUT).html.zip: $(HTMLDIR)
 	@echo "-- creating zipfile with html source files"
 	zip -r $@ $(HTMLDIR)
 
-$(OUTPUT).ps: $(OUTPUT).dvi
-	@echo "-- creating postscript file"
-	dvips -f $< > $(OUTPUT).ps
+#$(OUTPUT).ps: $(OUTPUT).dvi
+#	@echo "-- creating postscript file"
+#	dvips -f $< > $(OUTPUT).ps
 
-$(OUT).ps.zip: $(OUTPUT).ps
-	zip $@ $<
+#$(OUT).ps.zip: $(OUTPUT).ps
+#	zip $@ $<
 
-$(OUTPUT).pdf: $(OUTPUT).ps
+$(OUTPUT).pdf:
 	@echo "-- creating pdf file"
-	ps2pdf $<
+	pdflatex $(MAIN).tex;  pdflatex $(MAIN).tex;  pdflatex $(MAIN).tex  
+	mv $(MAIN).pdf $(OUTPUT).pdf
 
 $(OUT).pdf.zip: $(OUTPUT).pdf
 	zip $@ $<