Use pdflatex instead of plain latex

With recent texlive, I'm running into the following problem:

[snip]
! Package ifpdf Error: Name clash, \ifpdf is already defined.

See the ifpdf package documentation for explanation.
? H
Incompatible versions of \ifpdf can cause problems,
therefore package loading is aborted.
[snap]

Since we're only building pdf output anyway, I'm getting rid of it
and use `pdflatex' instead of `latex' in the Makefile.

diff --git a/Makefile b/Makefile
index 3e549dc..c3664df 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,5 +11,5 @@ clean:
 
 test: grml-zsh-refcard.tex
        make -f ../grml-gen-zshrefcard/Makefile
-       latex grml-zsh-refcard.tex
-       latex grml-zsh-refcard.tex
+       pdflatex grml-zsh-refcard.tex
+       pdflatex grml-zsh-refcard.tex

diff --git a/grml-zsh-refcard.tex.in b/grml-zsh-refcard.tex.in
index 389cc9a..c1562e5 100644 (file)
--- a/grml-zsh-refcard.tex.in
+++ b/grml-zsh-refcard.tex.in
@@ -47,40 +47,20 @@
 %%% }}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%% PDF {{{
-\newif\ifpdf
-  \ifx\pdfoutput\undefined
-    \pdffalse
-  \else
-    \pdfoutput=1
-    \pdftrue
-  \fi
-
-\ifpdfoutput{
-  \usepackage[pdftex]{graphicx}
-  \DeclareGraphicsExtensions{.pdf}
-  \pdfcompresslevel=9
-  \usepackage[%
-    pdftex=true,
-    backref=true,
-    colorlinks=true,
-    bookmarks=true,
-    breaklinks=true,
-    linktocpage=true,
-    bookmarksopen=false,
-    bookmarksnumbered=false,
-    pdfpagemode=None
-  ]{hyperref}
-}{
-  \usepackage[dvips]{graphicx}
-  \DeclareGraphicsExtensions{.eps}
-  % \usepackage[%
-  %   dvips,
-  %   breaklinks=true,
-  %   colorlinks=false
-  % ]{hyperref}
-}
+\usepackage[pdftex]{graphicx}
+\DeclareGraphicsExtensions{.pdf}
+\pdfcompresslevel=9
+\usepackage[%
+  pdftex=true,
+  backref=true,
+  colorlinks=true,
+  bookmarks=true,
+  breaklinks=true,
+  linktocpage=true,
+  bookmarksopen=false,
+  bookmarksnumbered=false,
+  pdfpagemode=None
+]{hyperref}
 %%% }}}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%