(DESTDIR, LIBDIR, BINDIR, MANDIR, MANEXT): Delete

unused variables.
(dired-refcards, misc-refcards, survival-card, viper-cards): New
targets.
(all): Also build dired-refcards and misc-refcards.
(clean, distclean, maintainer-clean): Depend on mostlyclean.
(SOURCES): Remove non-existent files.
(mostlyclean, clean, distclean, maintainer-clean, unlock, relock):
Mark as phony.
(.ps files): Specify default papersize in the dvips command.

1 files changed, 92 insertions, 23 deletions

diff --git a/etc/Makefile b/etc/Makefile
index a238bea1928..0226c2838d9 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,43 +1,110 @@
-DESTDIR=
-LIBDIR=/usr/local/lib
-BINDIR=/usr/local/bin
-MANDIR=/usr/man/man1
-MANEXT=1
+### Makefile for Emacs etc/ directory
 
-all:
+## Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006,
+##   2007 Free Software Foundation, Inc.
 
-refcards:       refcard.ps cs-refcard.ps de-refcard.ps fr-refcard.ps \
-                pl-refcard.ps pt-br-refcard.ps ru-refcard.ps sk-refcard.ps
+## This file is part of GNU Emacs.
+
+## 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 2, 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
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## 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.
+
+
+## Top-level targets.
+
+## PS files included with Emacs.
+all: refcards dired-refcards misc-refcards
+
+
+refcards: refcard.ps cs-refcard.ps de-refcard.ps fr-refcard.ps \
+          pl-refcard.ps pt-br-refcard.ps ru-refcard.ps sk-refcard.ps
+
+dired-refcards: dired-ref.ps cs-dired-ref.ps fr-drdref.ps sk-dired-ref.ps
+
+## No PS files: vipcard.tex viperCard.tex survival.tex sk-survival.tex
+misc-refcards: calccard.ps gnus-booklet.ps gnus-refcard.ps orgcard.ps
+
+## Following PS files are not included with Emacs.
+survival-cards: survival.ps cs-survival.ps sk-survival.ps
+
+viper-cards: vipcard.ps viperCard.ps
 
-refcard.dvi de-refcard.dvi fr-refcard.dvi pt-br-refcard.dvi sk-refcard.dvi:     %.dvi:  %.tex
-        tex $<
 
-cs-refcard.dvi: %.dvi:  %.tex
+## dvi files.
+
+## FIXME the sk-*.tex files say to use csplain, but were not
+## traditionally in this rule. Fix the doc or the rule.
+cs-refcard.dvi cs-dired-ref.dvi cs-survival.dvi: %.dvi: %.tex
         csplain $<
 
-pl-refcard.dvi: %.dvi:  %.tex
+pl-refcard.dvi: %.dvi: %.tex
         if ! kpsewhich -format=fmt mex > /dev/null; then \
           echo "No mex format found."; false; \
         fi
         tex $<
 
-ru-refcard.dvi: %.dvi:  %.tex
+ru-refcard.dvi gnus-refcard.dvi: %.dvi: %.tex
         latex $<
 
-refcard.ps de-refcard.ps fr-refcard.ps pt-br-refcard.ps:        %.ps:   %.dvi
-        dvips -t landscape $<
+gnus-booklet.dvi: gnus-refcard.tex
+        latex '\def\booklettrue{}\def\letterpapertrue{}\input{gnus-refcard}'
+        mv gnus-refcard.dvi $@
+
+## Everything not explicitly listed above.
+%.dvi: %.tex
+        tex $<
+
+
+## PostScript files.
+
+## Note that some of the tex files (refcard, de-refcard, fr-refcard,
+## pt-br-refcard) have settings for letter or a4 paper. Following are
+## the default paper sizes (letter for English, A4 for translations).
+## 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
+        dvips -t a4 -t landscape $<
 
-cs-refcard.ps pl-refcard.ps ru-refcard.ps sk-refcard.ps:        %.ps:   %.dvi
-        dvips $<
+## A4, portrait.
+cs-dired-ref.ps cs-refcard.ps cs-survival.ps fr-drdref.ps \
+pl-refcard.ps ru-refcard.ps \
+sk-dired-ref.ps sk-refcard.ps sk-survival.ps: %.ps: %.dvi
+        dvips -t a4 $<
+
+## letter, landscape.
+calccard.ps refcard.ps: %.ps: %.dvi
+        dvips -t letter -t landscape $<
+
+## letter, portrait.
+dired-ref.ps gnus-booklet.ps gnus-refcard.ps survival.ps vipcard.ps \
+viperCard.ps: %.ps: %.dvi
+        dvips -t letter $<
+
+
+.PHONY: mostlyclean clean distclean maintainer-clean unlock relock
 
 mostlyclean:
-        -rm -f core *.dvi *.log
+        -rm -f *.dvi *.log
+
+## Note does not delete generated ps files.
+clean distclean maintainer-clean: mostlyclean
+        -rm -f DOC*
 
-clean distclean maintainer-clean:
-        -rm -f DOC* core *.dvi *.log
 
-SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* etags.* ledit.l ms-* \
-        spook-lines tasks.texi termcap.* *.tex
+SOURCES = [0-9A-QS-Z]* README *.[ch16] emacs.* ms-* \
+        spook-lines termcap.* *.tex
 
 unlock:
         chmod u+w $(SOURCES)
@@ -54,4 +121,6 @@ TIC=tic
 e/eterm-color: e/eterm-color.ti
         TERMINFO=`pwd`; export TERMINFO; $(TIC) e/eterm-color.ti
 
-# arch-tag: 4261f003-cf77-4478-a10a-5284e9d8f797
+
+## arch-tag: 4261f003-cf77-4478-a10a-5284e9d8f797
+### Makefile ends here