X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f67e15be8d94718b2e2ea7da68eb0b2dc94ce016..dfdb4cadb8e49f1f226c8b0651558f4bf51a669c:/etc/refcards/Makefile

diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 4d3527eba9..64e2d8638f 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -1,14 +1,13 @@
 ### Makefile for Emacs refcards
 
-## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
-##   2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 1993-1994, 2001-2012  Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
-
-## GNU Emacs is free software; you can redistribute it and/or modify
+#
+## GNU Emacs is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3, or (at your option)
-## any later version.
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
 
 ## GNU Emacs is distributed in the hope that it will be useful,
 ## but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +15,7 @@
 ## GNU General Public License for more details.
 
 ## You should have received a copy of the GNU General Public License
-## along with GNU Emacs; see the file COPYING.  If not, write to the
-## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-## Boston, MA 02110-1301, USA.
+## along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 
 ## Top-level targets.
@@ -31,24 +28,24 @@ REFCARDS_PDF = refcard.pdf cs-refcard.pdf de-refcard.pdf fr-refcard.pdf \
 refcards_pdf: ${REFCARDS_PDF}
 refcards_ps: ${REFCARDS_PDF:.pdf=.ps}
 
-DIRED-REFCARDS_PDF = dired-ref.pdf cs-dired-ref.pdf fr-dired-ref.pdf \
+DIRED_REFCARDS_PDF = dired-ref.pdf cs-dired-ref.pdf fr-dired-ref.pdf \
 		sk-dired-ref.pdf
-dired-refcards_pdf: ${DIRED-REFCARDS_PDF}
-dired-refcards_ps: ${DIRED-REFCARDS_PDF:.pdf=.ps}
+dired-refcards_pdf: ${DIRED_REFCARDS_PDF}
+dired-refcards_ps: ${DIRED_REFCARDS_PDF:.pdf=.ps}
 
-MISC-REFCARDS_PDF = calccard.pdf gnus-booklet.pdf gnus-refcard.pdf orgcard.pdf
-misc-refcards_pdf: ${MISC-REFCARDS_PDF}
-misc-refcards_ps: ${MISC-REFCARDS_PDF:.pdf=.ps}
+MISC_REFCARDS_PDF = calccard.pdf gnus-booklet.pdf gnus-refcard.pdf orgcard.pdf
+misc-refcards_pdf: ${MISC_REFCARDS_PDF}
+misc-refcards_ps: ${MISC_REFCARDS_PDF:.pdf=.ps}
 
 
 ## The following files are not included with Emacs.
-SURVIVAL-CARDS_PDF = survival.pdf cs-survival.pdf sk-survival.pdf
-survival-cards_pdf: ${SURVIVAL-CARDS_PDF}
-survival-cards_ps: ${SURVIVAL-CARDS_PDF:.pdf=.ps}
+SURVIVAL_CARDS_PDF = survival.pdf cs-survival.pdf sk-survival.pdf
+survival-cards_pdf: ${SURVIVAL_CARDS_PDF}
+survival-cards_ps: ${SURVIVAL_CARDS_PDF:.pdf=.ps}
 
-VIPER-CARDS_PDF = vipcard.pdf viperCard.pdf
-viper-cards_pdf: ${VIPER-CARDS_PDF}
-viper-cards_ps: ${VIPER-CARDS_PDF:.pdf=.ps}
+VIPER_CARDS_PDF = vipcard.pdf viperCard.pdf
+viper-cards_pdf: ${VIPER_CARDS_PDF}
+viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps}
 
 
 ## PDF files.
@@ -57,33 +54,37 @@ viper-cards_ps: ${VIPER-CARDS_PDF:.pdf=.ps}
 
 cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \
 sk-dired-ref.pdf sk-survival.pdf: %.pdf:	%.tex
-	csplain "\pdfoutput=1\input $<"
+	if pdfcsplain --version > /dev/null 2> /dev/null; then \
+	  pdfcsplain $<; \
+	else \
+	  csplain "\pdfoutput=1\input $<"; \
+	fi
 
+## Some versions of pdfmex seem to create dvi by default, hence output-format.
 pl-refcard.pdf: %.pdf: %.tex
-	if ! kpsewhich -format=fmt mex > /dev/null; then \
+	if ! kpsewhich -format=fmt mex > /dev/null && \
+	  ! pdfmex --version > /dev/null 2> /dev/null; then \
 	  echo "No mex format found."; false; \
 	fi
-	pdftex $<
+	pdftex -output-format=pdf $<
 
 ru-refcard.pdf: %.pdf: %.tex
 	pdflatex $<
 
-gnus-logo.pdf: %.pdf: %.eps
-	ps2pdf $<
+#gnus-logo.pdf: %.pdf: %.eps
+#	ps2pdf $<
 
-gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf 
+gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf
 	pdflatex $<
 
 gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf
-	pdflatex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
-	mv gnus-refcard.pdf $@
+	pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
 
 ## Everything not explicitly listed above.
 %.pdf: %.tex
 	pdftex $<
 
 
-
 ## dvi files.
 
 cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
@@ -138,6 +139,6 @@ viperCard.ps: %.ps: %.dvi
 .PHONY: clean
 
 clean:
-	-rm -f *.dvi *.log
+	-rm -f *.dvi *.log *.aux
 
 ### Makefile ends here