HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bytecomp fix for bug#14565
[bpt/emacs.git]
/
etc
/
refcards
/
Makefile
diff --git
a/etc/refcards/Makefile
b/etc/refcards/Makefile
index
4d3527e
..
66fbc96
100644
(file)
--- a/
etc/refcards/Makefile
+++ b/
etc/refcards/Makefile
@@
-1,14
+1,13
@@
### Makefile for Emacs refcards
### 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-2013 Free Software Foundation, Inc.
## This file is part of GNU Emacs.
## 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
## 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
## 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
## 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.
## Top-level targets.
@@
-31,70
+28,75
@@
REFCARDS_PDF = refcard.pdf cs-refcard.pdf de-refcard.pdf fr-refcard.pdf \
refcards_pdf: ${REFCARDS_PDF}
refcards_ps: ${REFCARDS_PDF:.pdf=.ps}
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
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.
## 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}
+ENVADD = TEXINPUTS=".:"
## PDF files.
## The page layouts (a4/letter) are written directly in the .tex files.
cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \
## PDF files.
## The page layouts (a4/letter) are written directly in the .tex files.
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 $<"
+sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex emacsver.tex
+ if pdfcsplain --version > /dev/null 2> /dev/null; then \
+ ${ENVADD} pdfcsplain $<; \
+ else \
+ ${ENVADD} csplain "\pdfoutput=1\input $<"; \
+ fi
-pl-refcard.pdf: %.pdf: %.tex
- if ! kpsewhich -format=fmt mex > /dev/null; then \
+## Some versions of pdfmex seem to create dvi by default, hence output-format.
+pl-refcard.pdf: %.pdf: %.tex emacsver.tex
+ if ! kpsewhich -format=fmt mex > /dev/null && \
+ ! pdfmex --version > /dev/null 2> /dev/null; then \
echo "No mex format found."; false; \
fi
echo "No mex format found."; false; \
fi
-
pdftex
$<
+
${ENVADD} pdftex -output-format=pdf
$<
ru-refcard.pdf: %.pdf: %.tex
pdflatex $<
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 $<
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.
## Everything not explicitly listed above.
-%.pdf: %.tex
- pdftex $<
-
+%.pdf: %.tex emacsver.tex
+ ${ENVADD} pdftex $<
## dvi files.
cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
## dvi files.
cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
-sk-dired-ref.dvi sk-survival.dvi: %.dvi:
%
.tex
- csplain $<
+sk-dired-ref.dvi sk-survival.dvi: %.dvi:
%.tex emacsver
.tex
+
${ENVADD}
csplain $<
-pl-refcard.dvi: %.dvi: %.tex
+pl-refcard.dvi: %.dvi: %.tex
emacsver.tex
if ! kpsewhich -format=fmt mex > /dev/null; then \
echo "No mex format found."; false; \
fi
if ! kpsewhich -format=fmt mex > /dev/null; then \
echo "No mex format found."; false; \
fi
- tex $<
+
${ENVADD}
tex $<
ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
latex $<
ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
latex $<
@@
-104,8
+106,8
@@
gnus-booklet.dvi: gnus-refcard.tex
mv gnus-refcard.dvi $@
## Everything not explicitly listed above.
mv gnus-refcard.dvi $@
## Everything not explicitly listed above.
-%.dvi: %.tex
- tex $<
+%.dvi: %.tex
emacsver.tex
+
${ENVADD}
tex $<
## PostScript files.
## PostScript files.
@@
-138,6
+140,6
@@
viperCard.ps: %.ps: %.dvi
.PHONY: clean
clean:
.PHONY: clean
clean:
- -rm -f *.dvi *.log
+ -rm -f *.dvi *.log
*.aux
### Makefile ends here
### Makefile ends here