Merge from emacs-24; up to 2013-01-02T16:37:04Z!eggert@cs.ucla.edu

2 files changed, 20 insertions, 2 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index cbaa780a4a4..2c5bf37e3a7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-13  Glenn Morris  <rgm@gnu.org>
+
+        * refcards/Makefile (all_pdf, all_ps, fr-survival.ps, dist):
+        New rules.
+        (SURVIVAL_CARDS_PDF): Add fr_survival.pdf.
+
 2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * NEWS: Mention -lz and `decompress-gzipped-region'.
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index 66fbc96e181..ebd7ca9e408 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -23,6 +23,10 @@
 ## PDF files that are included with Emacs.
 all: refcards_pdf dired-refcards_pdf misc-refcards_pdf
 
+all_pdf: all survival-cards_pdf viper-cards_pdf
+all_ps: refcards_ps dired-refcards_ps misc-refcards_ps survival-cards_ps \
+        viper-cards_ps
+
 REFCARDS_PDF = refcard.pdf cs-refcard.pdf de-refcard.pdf fr-refcard.pdf \
             pl-refcard.pdf pt-br-refcard.pdf ru-refcard.pdf sk-refcard.pdf
 refcards_pdf: ${REFCARDS_PDF}
@@ -39,7 +43,7 @@ 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.pdf cs-survival.pdf fr-survival.pdf sk-survival.pdf
 survival-cards_pdf: ${SURVIVAL_CARDS_PDF}
 survival-cards_ps: ${SURVIVAL_CARDS_PDF:.pdf=.ps}
 
@@ -118,7 +122,7 @@ gnus-booklet.dvi: gnus-refcard.tex
 ## FIXME orgcard.ps does not fit on letter (see orgcard.tex).
 
 ## A4, landscape.
-de-refcard.ps fr-refcard.ps pt-br-refcard.ps orgcard.ps: %.ps: %.dvi
+de-refcard.ps fr-refcard.ps fr-survival.ps pt-br-refcard.ps orgcard.ps: %.ps: %.dvi
         dvips -t a4 -t landscape $< -o $@
 
 ## A4, portrait.
@@ -142,4 +146,12 @@ viperCard.ps: %.ps: %.dvi
 clean:
         -rm -f *.dvi *.log *.aux
 
+## For the Emacs website.
+dist:
+        rm -rf emacs-refcards
+        mkdir emacs-refcards
+        cp Makefile README *.tex gnus-logo.* pdflayout.sty emacs-refcards/
+        tar -cf emacs-refcards.tar emacs-refcards
+        rm -rf emacs-refcards
+
 ### Makefile ends here