aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-08-14 23:31:14 -0700
committerGlenn Morris2013-08-14 23:31:14 -0700
commit4fa4485689619ad0092e3fd289534cfb320f56f3 (patch)
treef72f5aa4f2bccf9d859c4c0458b32d429e53208d
parent555d556547d3cd97803ff2fcb06307a94e51ace5 (diff)
downloademacs-4fa4485689619ad0092e3fd289534cfb320f56f3.tar.gz
emacs-4fa4485689619ad0092e3fd289534cfb320f56f3.zip
Cleanup for etc/refcards/Makefile and related items
* .bzrignore: Unignore etc/refcards/Makefile. * make-dist: Do not distribute etc/refcards TeX intermediate files. * Makefile.in (install-arch-indep): Do not install etc/refcards TeX intermediate files. * etc/refcards/Makefile: Rewrite to use portable Makefile syntax. Add language-specific targets. (distclean, extraclean): New rules. * etc/refcards/README: Add copyright and license. Add Makefile details. Mention http and FSF store versions.
-rw-r--r--ChangeLog6
-rw-r--r--Makefile.in12
-rw-r--r--etc/ChangeLog6
-rw-r--r--etc/refcards/Makefile378
-rw-r--r--etc/refcards/README36
-rwxr-xr-xmake-dist3
6 files changed, 350 insertions, 91 deletions
diff --git a/ChangeLog b/ChangeLog
index 23e4b038663..8e8349aa487 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12013-08-15 Glenn Morris <rgm@gnu.org>
2
3 * make-dist: Do not distribute etc/refcards TeX intermediate files.
4 * Makefile.in (install-arch-indep):
5 Do not install etc/refcards TeX intermediate files.
6
12013-08-14 Ulrich Müller <ulm@gentoo.org> 72013-08-14 Ulrich Müller <ulm@gentoo.org>
2 8
3 * configure.ac (EMACS_CONFIGURATION): Escape backslashes. (Bug#15091) 9 * configure.ac (EMACS_CONFIGURATION): Escape backslashes. (Bug#15091)
diff --git a/Makefile.in b/Makefile.in
index db028132e5c..ee74baf45cf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -543,6 +543,11 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
543## deleted the entire installed etc/ directory and recreated it. 543## deleted the entire installed etc/ directory and recreated it.
544## install-etcdoc installs the relevant DOC. 544## install-etcdoc installs the relevant DOC.
545 545
546## Note that we install etc/refcards/*.ps if present.
547## TODO we should compress these if GZIP_PROG is set.
548## It would be simpler to have a separate install rule for etc/refcards
549## (maybe move it to doc/refcards?).
550
546## Note that the Makefiles in the etc directory are potentially useful 551## Note that the Makefiles in the etc directory are potentially useful
547## in an installed Emacs, so should not be excluded. 552## in an installed Emacs, so should not be excluded.
548 553
@@ -578,7 +583,12 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
578 (cd $${dir}; tar -chf - . ) \ 583 (cd $${dir}; tar -chf - . ) \
579 | (cd $${dest}; umask 022; \ 584 | (cd $${dest}; umask 022; \
580 tar -xvf - && cat > /dev/null) || exit 1; \ 585 tar -xvf - && cat > /dev/null) || exit 1; \
581 [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ 586 if [ "$${dir}" = "${srcdir}/etc" ]; then \
587 rm -f $${dest}/DOC* ; \
588 rm -f $${dest}/refcards/*.aux $${dest}/refcards/*.dvi; \
589 rm -f $${dest}/refcards/*.log; \
590 else true; \
591 fi; \
582 for subdir in `find $${dest} -type d -print` ; do \ 592 for subdir in `find $${dest} -type d -print` ; do \
583 chmod a+rx $${subdir} ; \ 593 chmod a+rx $${subdir} ; \
584 rm -f $${subdir}/.gitignore ; \ 594 rm -f $${subdir}/.gitignore ; \
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 2c5bf37e3a7..8b8667dce9e 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
12013-08-15 Glenn Morris <rgm@gnu.org>
2
3 * refcards/Makefile: Rewrite to use portable Makefile syntax.
4 Add language-specific targets.
5 (distclean, extraclean): New rules.
6
12013-08-13 Glenn Morris <rgm@gnu.org> 72013-08-13 Glenn Morris <rgm@gnu.org>
2 8
3 * refcards/Makefile (all_pdf, all_ps, fr-survival.ps, dist): 9 * refcards/Makefile (all_pdf, all_ps, fr-survival.ps, dist):
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index ebd7ca9e408..5f7aedf7993 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -17,128 +17,321 @@
17## You should have received a copy of the GNU General Public License 17## You should have received a copy of the GNU General Public License
18## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 18## along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
19 19
20### Commentary:
20 21
21## Top-level targets. 22## See README for details.
22 23
23## PDF files that are included with Emacs. 24PDF_ENGLISH = \
24all: refcards_pdf dired-refcards_pdf misc-refcards_pdf 25 calccard.pdf \
26 dired-ref.pdf \
27 gnus-booklet.pdf \
28 gnus-refcard.pdf \
29 orgcard.pdf \
30 refcard.pdf \
31 survival.pdf \
32 vipcard.pdf \
33 viperCard.pdf
25 34
26all_pdf: all survival-cards_pdf viper-cards_pdf 35PDF_CZECH = \
27all_ps: refcards_ps dired-refcards_ps misc-refcards_ps survival-cards_ps \ 36 cs-dired-ref.pdf \
28 viper-cards_ps 37 cs-refcard.pdf \
38 cs-survival.pdf
29 39
30REFCARDS_PDF = refcard.pdf cs-refcard.pdf de-refcard.pdf fr-refcard.pdf \ 40PDF_FRENCH = \
31 pl-refcard.pdf pt-br-refcard.pdf ru-refcard.pdf sk-refcard.pdf 41 fr-dired-ref.pdf \
32refcards_pdf: ${REFCARDS_PDF} 42 fr-refcard.pdf \
33refcards_ps: ${REFCARDS_PDF:.pdf=.ps} 43 fr-survival.pdf \
34 44
35DIRED_REFCARDS_PDF = dired-ref.pdf cs-dired-ref.pdf fr-dired-ref.pdf \ 45PDF_GERMAN = de-refcard.pdf
36 sk-dired-ref.pdf
37dired-refcards_pdf: ${DIRED_REFCARDS_PDF}
38dired-refcards_ps: ${DIRED_REFCARDS_PDF:.pdf=.ps}
39 46
40MISC_REFCARDS_PDF = calccard.pdf gnus-booklet.pdf gnus-refcard.pdf orgcard.pdf 47PDF_POLISH = pl-refcard.pdf
41misc-refcards_pdf: ${MISC_REFCARDS_PDF}
42misc-refcards_ps: ${MISC_REFCARDS_PDF:.pdf=.ps}
43 48
49PDF_PORTUGUESE = pt-br-refcard.pdf
44 50
45## The following files are not included with Emacs. 51PDF_RUSSIAN = ru-refcard.pdf
46SURVIVAL_CARDS_PDF = survival.pdf cs-survival.pdf fr-survival.pdf sk-survival.pdf
47survival-cards_pdf: ${SURVIVAL_CARDS_PDF}
48survival-cards_ps: ${SURVIVAL_CARDS_PDF:.pdf=.ps}
49 52
50VIPER_CARDS_PDF = vipcard.pdf viperCard.pdf 53PDF_SLOVAKIAN = \
51viper-cards_pdf: ${VIPER_CARDS_PDF} 54 sk-dired-ref.pdf \
52viper-cards_ps: ${VIPER_CARDS_PDF:.pdf=.ps} 55 sk-refcard.pdf \
56 sk-survival.pdf
53 57
54ENVADD = TEXINPUTS=".:" 58PDF_TARGETS = $(PDF_ENGLISH) $(PDF_CZECH) $(PDF_FRENCH) $(PDF_GERMAN) \
59 $(PDF_POLISH) $(PDF_PORTUGUESE) $(PDF_RUSSIAN) $(PDF_SLOVAKIAN)
55 60
56## PDF files. 61PS_ENGLISH = \
62 calccard.ps \
63 dired-ref.ps \
64 gnus-booklet.ps \
65 gnus-refcard.ps \
66 orgcard.ps \
67 refcard.ps \
68 survival.ps \
69 vipcard.ps \
70 viperCard.ps
57 71
58## The page layouts (a4/letter) are written directly in the .tex files. 72PS_CZECH = \
73 cs-dired-ref.ps \
74 cs-refcard.ps \
75 cs-survival.ps
59 76
60cs-refcard.pdf cs-dired-ref.pdf cs-survival.pdf sk-refcard.pdf \ 77PS_FRENCH = \
61sk-dired-ref.pdf sk-survival.pdf: %.pdf: %.tex emacsver.tex 78 fr-dired-ref.ps \
62 if pdfcsplain --version > /dev/null 2> /dev/null; then \ 79 fr-refcard.ps \
63 ${ENVADD} pdfcsplain $<; \ 80 fr-survival.ps \
64 else \
65 ${ENVADD} csplain "\pdfoutput=1\input $<"; \
66 fi
67 81
68## Some versions of pdfmex seem to create dvi by default, hence output-format. 82PS_GERMAN = de-refcard.ps
69pl-refcard.pdf: %.pdf: %.tex emacsver.tex
70 if ! kpsewhich -format=fmt mex > /dev/null && \
71 ! pdfmex --version > /dev/null 2> /dev/null; then \
72 echo "No mex format found."; false; \
73 fi
74 ${ENVADD} pdftex -output-format=pdf $<
75 83
76ru-refcard.pdf: %.pdf: %.tex 84PS_POLISH = pl-refcard.ps
77 pdflatex $<
78 85
79#gnus-logo.pdf: %.pdf: %.eps 86PS_PORTUGUESE = pt-br-refcard.ps
80# ps2pdf $<
81 87
82gnus-refcard.pdf: %.pdf: %.tex gnus-logo.pdf 88PS_RUSSIAN = ru-refcard.ps
83 pdflatex $<
84 89
85gnus-booklet.pdf: gnus-refcard.tex gnus-logo.pdf 90PS_SLOVAKIAN = \
86 pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}' 91 sk-dired-ref.ps \
92 sk-refcard.ps \
93 sk-survival.ps
87 94
88## Everything not explicitly listed above. 95PS_TARGETS = $(PS_ENGLISH) $(PS_CZECH) $(PS_FRENCH) $(PS_GERMAN) \
89%.pdf: %.tex emacsver.tex 96 $(PS_POLISH) $(PS_PORTUGUESE) $(PS_RUSSIAN) $(PS_SLOVAKIAN)
90 ${ENVADD} pdftex $<
91 97
92 98
93## dvi files. 99## For emacsver.tex.
100ENVADD = TEXINPUTS=".:$(TEXINPUTS)"
94 101
95cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi sk-refcard.dvi \
96sk-dired-ref.dvi sk-survival.dvi: %.dvi: %.tex emacsver.tex
97 ${ENVADD} csplain $<
98 102
99pl-refcard.dvi: %.dvi: %.tex emacsver.tex 103.PHONY: all pdf ps
100 if ! kpsewhich -format=fmt mex > /dev/null; then \
101 echo "No mex format found."; false; \
102 fi
103 ${ENVADD} tex $<
104 104
105ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex 105all: pdf
106 latex $< 106pdf: $(PDF_TARGETS)
107ps: $(PS_TARGETS)
107 108
108gnus-booklet.dvi: gnus-refcard.tex
109 latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
110 mv gnus-refcard.dvi $@
111 109
112## Everything not explicitly listed above. 110.PHONY: english czech french german polish portuguese russian slovakian
113%.dvi: %.tex emacsver.tex 111english: $(PDF_ENGLISH)
114 ${ENVADD} tex $< 112czech: $(PDF_CZECH)
113french: $(PDF_FRENCH)
114german: $(PDF_GERMAN)
115polish: $(PDF_POLISH)
116portuguese: $(PDF_PORTUGUESE)
117russian: $(PDF_RUSSIAN)
118slovakian: $(PDF_SLOVAKIAN)
115 119
120.PHONY: english-ps czech-ps french-ps german-ps polish-ps portuguese-ps russian-ps slovakian-ps
121english-ps: $(PS_ENGLISH)
122czech-ps: $(PS_CZECH)
123french-ps: $(PS_FRENCH)
124german-ps: $(PS_GERMAN)
125polish-ps: $(PS_POLISH)
126portuguese-ps: $(PS_PORTUGUESE)
127russian-ps: $(PS_RUSSIAN)
128slovakian-ps: $(PS_SLOVAKIAN)
116 129
117## PostScript files.
118 130
119## Note that some of the tex files (refcard, de-refcard, fr-refcard, 131## Default for file that do not use a different paper size.
120## pt-br-refcard) have settings for letter or a4 paper. Following are 132.SUFFIXES: .ps .dvi
121## the default paper sizes (letter for English, A4 for translations). 133.dvi.ps:
122## FIXME orgcard.ps does not fit on letter (see orgcard.tex). 134 dvips -t letter -o $@ $<
135
136
137make_cs=if pdfcsplain --version > /dev/null 2> /dev/null; then \
138 $(ENVADD) pdfcsplain $$input; \
139 else \
140 $(ENVADD) csplain "\pdfoutput=1\input $$input"; \
141 fi
123 142
124## A4, landscape. 143## For pdf output, the page layouts (a4/letter) are written directly
125de-refcard.ps fr-refcard.ps fr-survival.ps pt-br-refcard.ps orgcard.ps: %.ps: %.dvi 144## in the .tex files.
126 dvips -t a4 -t landscape $< -o $@
127 145
128## A4, portrait. 146## For PostScript output, note that some of the tex files (refcard,
129cs-dired-ref.ps cs-refcard.ps cs-survival.ps fr-dired-ref.ps \ 147## de-refcard, fr-refcard, pt-br-refcard) have settings for letter or
130pl-refcard.ps ru-refcard.ps \ 148## a4 paper. The Following are the default paper sizes (letter for English,
131sk-dired-ref.ps sk-refcard.ps sk-survival.ps: %.ps: %.dvi 149## A4 for translations).
132 dvips -t a4 $< -o $@ 150## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
133 151
134## letter, landscape. 152## A4, landscape: de-refcard, fr-refcard, pt-br-refcard orgcard
135calccard.ps refcard.ps: %.ps: %.dvi 153## A4, portrait: cs-*, fr-dired-ref, sk-*, pl-refcard, ru-refcard
136 dvips -t letter -t landscape $< -o $@ 154## Letter, landscape: calccard, refcard
155## Letter, portrait (suffix rule): diref-ref, gnus-*, survival, vip*
156
157calccard_deps = calccard.tex emacsver.tex pdflayout.sty
158calccard.pdf: $(calccard_deps)
159 $(ENVADD) pdftex calccard.tex
160calccard.dvi: $(calccard_deps)
161 $(ENVADD) tex calccard.tex
162calccard.ps: calccard.dvi
163 dvips -t letter -t landscape -o $@ calccard.dvi
164
165cs_dired_ref_deps = cs-dired-ref.tex emacsver.tex pdflayout.sty
166cs-dired-ref.pdf: $(cs_dired_ref_deps)
167 input=cs-dired-ref.tex; $(make_cs)
168cs-dired-ref.dvi: $(cs_dired_ref_deps)
169 $(ENVADD) csplain cs-dired-ref.tex
170cs-dired-ref.ps: cs-dired-ref.dvi
171 dvips -t a4 -o $@ cs-dired-ref.dvi
172
173cs_refcard_deps = cs-refcard.tex emacsver.tex pdflayout.sty
174cs-refcard.pdf: $(cs_refcard_deps)
175 input=cs-refcard.tex; $(make_cs)
176cs-refcard.dvi: $(cs_refcard_deps)
177 $(ENVADD) csplain cs-refcard.tex
178cs-refcard.ps: cs-refcard.dvi
179 dvips -t a4 -o $@ cs-refcard.dvi
180
181cs_survival_deps = cs-survival.tex emacsver.tex pdflayout.sty
182cs-survival.pdf: $(cs_survival_deps)
183 input=cs-survival.tex; $(make_cs)
184cs-survival.dvi: $(cs_survival_deps)
185 $(ENVADD) csplain cs-survival.tex
186cs-survival.ps: cs-survival.dvi
187 dvips -t a4 -o $@ cs-survival.dvi
188
189de_refcard_deps = de-refcard.tex emacsver.tex pdflayout.sty
190de-refcard.pdf: $(de_refcard_deps)
191 $(ENVADD) pdftex de-refcard.tex
192de-refcard.dvi: $(de_refcard_deps)
193 $(ENVADD) tex de-refcard.tex
194de-refcard.ps: de-refcard.dvi
195 dvips -t a4 -t landscape -o $@ de-refcard.dvi
196
197dired_ref_deps = dired-ref.tex emacsver.tex pdflayout.sty
198dired-ref.pdf: $(dired_ref_deps)
199 $(ENVADD) pdftex dired-ref.tex
200dired-ref.dvi: $(dired_ref_deps)
201 $(ENVADD) tex dired-ref.tex
202
203fr_dired_ref_deps = fr-dired-ref.tex emacsver.tex pdflayout.sty
204fr-dired-ref.pdf: $(fr_dired_ref_deps)
205 $(ENVADD) pdftex fr-dired-ref.tex
206fr-dired-ref.dvi: $(fr_dired_ref_deps)
207 $(ENVADD) tex fr-dired-ref.tex
208fr-dired-ref.ps: fr-dired-ref.dvi
209 dvips -t a4 -o $@ fr-dired-ref.dvi
210
211fr_refcard_deps = fr-refcard.tex emacsver.tex pdflayout.sty
212fr-refcard.pdf: $(fr_refcard_deps)
213 $(ENVADD) pdftex fr-refcard.tex
214fr-refcard.dvi: $(fr_refcard_deps)
215 $(ENVADD) tex fr-refcard.tex
216fr-refcard.ps: fr-refcard.dvi
217 dvips -t a4 -t landscape -o $@ fr-refcard.dvi
218
219fr_survival_deps = fr-survival.tex emacsver.tex pdflayout.sty
220fr-survival.pdf: $(fr_survival_deps)
221 $(ENVADD) pdftex fr-survival.tex
222fr-survival.dvi: $(fr_survival_deps)
223 $(ENVADD) tex fr-survival.tex
224fr-survival.ps: fr-survival.dvi
225 dvips -t a4 -o $@ fr-survival.dvi
226
227## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
228gnus_booklet_deps = gnus-refcard.tex gnus-logo.pdf
229gnus-booklet.pdf: $(gnus_booklet_deps)
230 pdflatex -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
231gnus-booklet.dvi: gnus-refcard.tex gnus-logo.eps
232 latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
233 mv gnus-refcard.dvi $@
137 234
138## letter, portrait. 235###gnus-logo.pdf: gnus-logo.eps
139dired-ref.ps gnus-booklet.ps gnus-refcard.ps survival.ps vipcard.ps \ 236### ps2pdf gnus-logo.eps
140viperCard.ps: %.ps: %.dvi 237
141 dvips -t letter $< -o $@ 238## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
239gnus_refcard_deps = gnus-refcard.tex gnus-logo.pdf
240gnus-refcard.pdf: $(gnus_refcard_deps)
241 pdflatex gnus-refcard.tex
242gnus-refcard.dvi: $(gnus_refcard_deps)
243 latex gnus-refcard.tex
244
245orgcard_deps = orgcard.tex emacsver.tex pdflayout.sty
246orgcard.pdf: $(orgcard_deps)
247 $(ENVADD) pdftex orgcard.tex
248orgcard.dvi: $(orgcard_deps)
249 $(ENVADD) tex orgcard.tex
250orgcard.ps: orgcard.dvi
251 dvips -t a4 -t landscape -o $@ orgcard.dvi
252
253pl_refcard_deps = pl-refcard.tex emacsver.tex pdflayout.sty
254## Some versions of pdfmex seem to create dvi by default, hence output-format.
255pl-refcard.pdf: $(pl_refcard_deps)
256 if ! kpsewhich -format=fmt mex > /dev/null && \
257 ! pdfmex --version > /dev/null 2> /dev/null; then \
258 echo "No mex format found."; false; \
259 fi
260 $(ENVADD) pdftex -output-format=pdf pl-refcard.tex
261pl-refcard.dvi: $(pl_refcard_deps)
262 if ! kpsewhich -format=fmt mex > /dev/null; then \
263 echo "No mex format found."; false; \
264 fi
265 $(ENVADD) tex pl-refcard.tex
266pl-refcard.ps: pl-refcard.dvi
267 dvips -t a4 -o $@ pl-refcard.dvi
268
269pt_br_refcard_deps = pt-br-refcard.tex emacsver.tex pdflayout.sty
270pt-br-refcard.pdf: $(pt_br_refcard_deps)
271 $(ENVADD) pdftex pt-br-refcard.tex
272pt-br-refcard.dvi: $(pt_br_refcard_deps)
273 $(ENVADD) tex pt-br-refcard.tex
274pt-br-refcard.ps: pt-br-refcard.dvi
275 dvips -t a4 -t landscape -o $@ pt-br-refcard.dvi
276
277refcard_deps = refcard.tex emacsver.tex pdflayout.sty
278refcard.pdf: $(refcard_deps)
279 $(ENVADD) pdftex refcard.tex
280refcard.dvi: $(refcard_deps)
281 $(ENVADD) tex refcard.tex
282refcard.ps: refcard.dvi
283 dvips -t letter -t landscape -o $@ refcard.dvi
284
285## No dependency on emacsver.tex, pdflayout.sty; no need for ENVADD.
286ru_refcard_deps = ru-refcard.tex
287ru-refcard.pdf: $(ru_refcard_deps)
288 pdflatex ru-refcard.tex
289ru-refcard.dvi: $(ru_refcard_deps)
290 latex ru-refcard.tex
291ru-refcard.ps: ru-refcard.dvi
292 dvips -t a4 -o $@ ru-refcard.dvi
293
294sk_dired_ref_deps = sk-dired-ref.tex emacsver.tex pdflayout.sty
295sk-dired-ref.pdf: $(sk_dired_ref_deps)
296 input=sk-dired-ref.tex; $(make_cs)
297sk-dired-ref.dvi: $(sk_dired_ref_deps)
298 $(ENVADD) csplain sk-dired-ref.tex
299sk-dired-ref.ps: sk-dired-ref.dvi
300 dvips -t a4 -o $@ sk-dired-ref.dvi
301
302sk_refcard_deps = sk-refcard.tex emacsver.tex pdflayout.sty
303sk-refcard.pdf: $(sk_refcard_deps)
304 input=sk-refcard.tex; $(make_cs)
305sk-refcard.dvi: $(sk_refcard_deps)
306 $(ENVADD) csplain sk-refcard.tex
307sk-refcard.ps: sk-refcard.dvi
308 dvips -t a4 -o $@ sk-refcard.dvi
309
310sk_survival_deps = sk-survival.tex emacsver.tex pdflayout.sty
311sk-survival.pdf: $(sk_survival_deps)
312 input=sk-survival.tex; $(make_cs)
313sk-survival.dvi: $(sk_survival_deps)
314 $(ENVADD) csplain sk-survival.tex
315sk-survival.ps: sk-survival.dvi
316 dvips -t a4 -o $@ sk-survival.dvi
317
318survival_deps = survival.tex emacsver.tex pdflayout.sty
319survival.pdf: $(survival_deps)
320 $(ENVADD) pdftex survival.tex
321survival.dvi: $(survival_deps)
322 $(ENVADD) tex survival.tex
323
324vipcard_deps = vipcard.tex emacsver.tex pdflayout.sty
325vipcard.pdf: $(vipcard_deps)
326 $(ENVADD) pdftex vipcard.tex
327vipcard.dvi: $(vipcard_deps)
328 $(ENVADD) tex vipcard.tex
329
330vipercard_deps = viperCard.tex emacsver.tex pdflayout.sty
331viperCard.pdf: $(vipercard_deps)
332 $(ENVADD) pdftex viperCard.tex
333viperCard.dvi: $(vipercard_deps)
334 $(ENVADD) tex viperCard.tex
142 335
143 336
144.PHONY: clean 337.PHONY: clean
@@ -146,6 +339,13 @@ viperCard.ps: %.ps: %.dvi
146clean: 339clean:
147 -rm -f *.dvi *.log *.aux 340 -rm -f *.dvi *.log *.aux
148 341
342distclean: clean
343
344## This should really by maintainer-clean, but the handling of the
345## refcards is funny. So abuse extraclean for this.
346extraclean: clean
347 -rm -f $(PDF_TARGETS) $(PS_TARGETS)
348
149## For the Emacs website. 349## For the Emacs website.
150dist: 350dist:
151 rm -rf emacs-refcards 351 rm -rf emacs-refcards
diff --git a/etc/refcards/README b/etc/refcards/README
index 273f7ca317c..7a8c7c76bf4 100644
--- a/etc/refcards/README
+++ b/etc/refcards/README
@@ -1,5 +1,11 @@
1Copyright (C) 2013 Free Software Foundation, Inc.
2See the end of the file for license conditions.
3
4
5REFERENCE CARDS FOR GNU EMACS
6
1To generate these refcards, you need to install the TeX document 7To generate these refcards, you need to install the TeX document
2production system. For example, http://www.tug.org/texlive/ . 8production system. For example, <http://www.tug.org/texlive/>.
3 9
4All modern GNU/Linux distributions provide TeX packages, so the 10All modern GNU/Linux distributions provide TeX packages, so the
5easiest way is just to install those. Your distribution may have 11easiest way is just to install those. Your distribution may have
@@ -7,7 +13,18 @@ split some of the files needed to process non-English output into
7separate, optional packages such as: texlive-lang-cyrillic, 13separate, optional packages such as: texlive-lang-cyrillic,
8texlive-lang-czechslovak, texlive-lang-german, and texlive-lang-polish. 14texlive-lang-czechslovak, texlive-lang-german, and texlive-lang-polish.
9 15
16Type `make all' (or `make pdf') to generate PDF versions of all the cards.
17For PostScript format, use `make ps'.
18To only generate the cards for a specific language, use e.g.
19`make french' or `make french-ps'. As mentioned above, you may need
20to install extra TeX packages for some languages.
21
22PDF and PS copies of these cards are also available at
23<http://www.gnu.org/software/emacs/refcards>. The FSF online
24store <http://shop.fsf.org/> sometimes has printed copies for sale.
25
10 26
27
11COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES 28COPYRIGHT AND LICENSE INFORMATION FOR IMAGE FILES
12 29
13The file gnus-logo.eps contains copyright and license information, but 30The file gnus-logo.eps contains copyright and license information, but
@@ -17,3 +34,20 @@ File: gnus-logo.eps, gnus-logo.pdf
17 Author: Luis Fernandes <elf@ee.ryerson.ca> 34 Author: Luis Fernandes <elf@ee.ryerson.ca>
18 Copyright (C) 2001-2013 Free Software Foundation, Inc. 35 Copyright (C) 2001-2013 Free Software Foundation, Inc.
19 License: GNU General Public License version 3 or later (see COPYING) 36 License: GNU General Public License version 3 or later (see COPYING)
37
38
39
40This file is part of GNU Emacs.
41
42GNU Emacs is free software: you can redistribute it and/or modify
43it under the terms of the GNU General Public License as published by
44the Free Software Foundation, either version 3 of the License, or
45(at your option) any later version.
46
47GNU Emacs is distributed in the hope that it will be useful,
48but WITHOUT ANY WARRANTY; without even the implied warranty of
49MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
50GNU General Public License for more details.
51
52You should have received a copy of the GNU General Public License
53along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
diff --git a/make-dist b/make-dist
index 75e4b22b238..920ca2bc786 100755
--- a/make-dist
+++ b/make-dist
@@ -476,6 +476,9 @@ echo "Making links to \`etc' and its subdirectories"
476for f in `find etc -type f`; do 476for f in `find etc -type f`; do
477 case $f in 477 case $f in
478 etc/DOC*|etc/*.pyc) continue ;; 478 etc/DOC*|etc/*.pyc) continue ;;
479 ## Arguably we should not exclude *.ps.
480 etc/refcards/*.aux|etc/refcards/*.dvi|etc/refcards/*.log|etc/refcards/*.ps)
481 continue ;;
479 esac 482 esac
480 ln $f $tempdir/$f 483 ln $f $tempdir/$f
481done 484done