[Gpg4win-commits] r1434 - in trunk/doc: . manual

[scm-commit@wald.intevation.org]

Author: emanuel
Date: 2010-05-21 17:44:04 +0200 (Fri, 21 May 2010)
New Revision: 1434

Modified:
   trunk/doc/ChangeLog
   trunk/doc/manual/Makefile.am
Log:
Integrated makeindex. Switched from pdflatex to texi2pdf.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2010-05-21 15:41:29 UTC (rev 1433)
+++ trunk/doc/ChangeLog	2010-05-21 15:44:04 UTC (rev 1434)
@@ -54,6 +54,10 @@
 	* manual/fdl-book.tex, manual/gpg4win-compendium-de.tex: Update
 	index.
 
+	* manual/Makefile.am: Integrate makeindex with style file in pdf
+	build process. Switch from pdflatex to texi2pdf.
+
+
 2010-05-20  Emanuel Schuetze <emanuel at intevation.de>
 
 	* manual/gpg4win-compendium-de.tex: Add link to gpg4win website.

Modified: trunk/doc/manual/Makefile.am
===================================================================
--- trunk/doc/manual/Makefile.am	2010-05-21 15:41:29 UTC (rev 1433)
+++ trunk/doc/manual/Makefile.am	2010-05-21 15:44:04 UTC (rev 1434)
@@ -17,7 +17,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
-PDFLATEX = pdflatex
+TEXI2PDF = texi2pdf
+INDEX = makeindex
 
 png_files = \
 		sc-kleopatra-startmenu_de.png\
@@ -155,7 +156,6 @@
 
 eps_files = $(png_files:.png=.eps)
 
-
 EXTRA_DIST = gpg4win-compendium-de.tex \
 				fdl.tex fdl-book.tex version.tex.in  \
 		  		$(eps_files) $(png_files) $(web_png_files) \
@@ -166,7 +166,7 @@
 				# einsteiger.tex durchblicker.tex was-ist-gpg4win.tex macros.tex
 
 CLEANFILES = $(eps_files) \
-             *.dvi *.pdf *.pdf *.toc *.log *.aux *.out \
+             *.dvi *.pdf *.pdf *.toc *.log *.aux *.out *.idx *.ilg *.ind\
 	     	 *.html.d-stamp  *.html.d/*
 DISTCLEANFILES = version.tex
 
@@ -179,8 +179,8 @@
 	   		gpg4win-compendium-de.html.d-stamp \
 			novices.pdf
 
-gpg4win-compendium-de.pdf : version.tex
-gpg4win-compendium-de.dvi : eps version.tex
+gpg4win-compendium-de.pdf : indexstyle.ist version.tex
+gpg4win-compendium-de.dvi : indexstyle.ist version.tex eps
 gpg4win-compendium-de.html.d-stamp : version.tex 
 einsteiger.dvi : version.tex macros.tex $(eps_files)
 einsteiger.html.d-stamp : version.tex macros.tex $(eps_files)
@@ -199,7 +199,8 @@
 	$(TEXI2DVI) `test -f '$<' || echo '$(srcdir)/'`$< 
 
 %.pdf : %.tex
-	$(PDFLATEX) $<
+	export MAKEINDEX='makeindex -g -s indexstyle.ist'; \
+	$(TEXI2PDF) $<
 
 pdf-de: gpg4win-compendium-de.pdf