Redo spelling of Makefile variables to conform to POSIX.

4 files changed, 73 insertions, 42 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 75670ff0218..db1c5d41c34 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,15 @@
+2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Redo spelling of Makefile variables to conform to POSIX.
+        POSIX does not allow "-" in Makefile variable names.
+        Reported by Bruno Haible in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
+        * refcards/Makefile (DIRED_REFCARDS_PDF): Renamed from
+        DIRED-REFCARDS_PDF.
+        (MISC_REFCARDS_PDF): Renamed from MISC-REFCARDS_PDF.
+        (SURVIVAL_CARDS_PDF): Renamed from SURVIVAL-CARDS_PDF.
+        (VIPER_CARDS_PDF): Renamed from VIPER-CARDS_PDF.
+
 2011-01-18  Glenn Morris  <rgm@gnu.org>
 
         * PROBLEMS: Add note about svn+ssh.  (Bug#7791)
diff --git a/etc/refcards/Makefile b/etc/refcards/Makefile
index b1785356d48..115b0ca084a 100644
--- a/etc/refcards/Makefile
+++ b/etc/refcards/Makefile
@@ -28,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.
@@ -74,7 +74,7 @@ ru-refcard.pdf: %.pdf: %.tex
 #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
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 519d91df26e..6f55095aac7 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,22 @@
+2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Redo spelling of Makefile variables to conform to POSIX.
+        POSIX does not allow "-" in Makefile variable names.
+        Reported by Bruno Haible in
+        <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00990.html>.
+        * Makefile.in (BUILT_EMACS): Renamed from BUILT-EMACS.
+        (TIT_GB): Renamed from TIT-GB.
+        (CHINESE_TIT): Renamed from CHINESE-TIT.
+        (NON_TIT_GB): Renamed from NON-TIT-GB.
+        (NON_TIT_BIG5): Renamed from NON-TIT-BIG5.
+        (CHINESE_NON_TIT): Renamed from CHINESE-NON-TIT.
+        (CHINESE_GB): Renamed from CHINESE-GB.
+        (CHINESE_BIG5): Renamed from CHINESE-BIG5.
+        (TIT_MISC): Renamed from TIT-MISC.
+        (NON_TIT_MISC): Renamed from NON-TIT-MISC.
+        (TIT_SOURCES): Renamed from TIT-SOURCES.
+        (MISC_SOURCES): Renamed from MISC-SOURCES.
+
 2011-01-08  Glenn Morris  <rgm@gnu.org>
 
         * makefile.w32-in (RUN_EMACS):
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 037d991ae3a..8c2baadf15f 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -41,20 +41,20 @@ GZIP_PROG = @GZIP_PROG@
 
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # byte-compile Emacs Lisp files, and generate the file leim-list.el.
-BUILT-EMACS = ../src/emacs
+BUILT_EMACS = ../src/emacs
 
 buildlisppath=${srcdir}/../lisp
 
 # How to run Emacs.
-RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
-        ${BUILT-EMACS} -batch --no-site-file --no-site-lisp
+RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
+        ${BUILT_EMACS} -batch --no-site-file --no-site-lisp
 
 # Subdirectories to be made if ${srcdir} is different from the current
 # directory.
 SUBDIRS=quail
 
 # Files generated from TIT dictionaries for Chinese GB character set.
-TIT-GB=\
+TIT_GB=\
         quail/CCDOSPY.elc       \
         quail/Punct.elc         \
         quail/QJ.elc            \
@@ -72,17 +72,17 @@ TIT-BIG5=\
         quail/QJ-b5.elc         \
         quail/ZOZY.elc
 
-CHINESE-TIT=${TIT-GB} ${TIT-BIG5}
+CHINESE_TIT=${TIT_GB} ${TIT_BIG5}
 
-NON-TIT-GB=${srcdir}/quail/py-punct.elc
+NON_TIT_GB=${srcdir}/quail/py-punct.elc
 
-NON-TIT-BIG5=${srcdir}/quail/pypunct-b5.elc
+NON_TIT_BIG5=${srcdir}/quail/pypunct-b5.elc
 
-CHINESE-NON-TIT=${NON-TIT-GB} ${NON-TIT-BIG5}
+CHINESE_NON_TIT=${NON_TIT_GB} ${NON_TIT_BIG5}
 
-CHINESE-GB=${TIT-GB} ${NON-TIT-GB}
+CHINESE_GB=${TIT_GB} ${NON_TIT_GB}
 
-CHINESE-BIG5=${TIT-BIG5} ${NON-TIT-BIG5}
+CHINESE_BIG5=${TIT_BIG5} ${NON_TIT_BIG5}
 
 JAPANESE=${srcdir}/quail/japanese.elc ${srcdir}/ja-dic/ja-dic.elc
 
@@ -138,22 +138,22 @@ MISC= \
         quail/CTLau.elc         \
         quail/CTLau-b5.elc
 
-CHINESE=${CHINESE-GB} ${CHINESE-BIG5}
+CHINESE=${CHINESE_GB} ${CHINESE_BIG5}
 EASTASIA=${CHINESE} ${JAPANESE} ${KOREAN}
 ASIA=${EASTASIA} ${THAI} ${VIETNAMESE} ${LAO} ${INDIAN} ${TIBETAN}
 EUROPEAN=${LATIN} ${SLAVIC} ${GREEK} ${RUSSIAN}
 WORLD=${ASIA} ${EUROPEAN} ${OTHERS} ${MISC} ${UNICODE}
 
-TIT-MISC=${CHINESE-TIT} ${MISC}
-NON-TIT-MISC=${CHINESE-NON-TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS}
+TIT_MISC=${CHINESE_TIT} ${MISC}
+NON_TIT_MISC=${CHINESE_NON_TIT} ${JAPANESE} ${KOREAN} ${EUROPEAN} ${OTHERS}
 
 .SUFFIXES: .elc .el
 
 .el.elc:
         @echo Compiling $<
-        @${RUN-EMACS} -f batch-byte-compile $<
+        @${RUN_EMACS} -f batch-byte-compile $<
 
-all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD}
+all: ${BUILT_EMACS} ${SUBDIRS} leim-list.el ${WORLD}
 
 # To ensure that we can run Emacs.  This target is ignored (never
 # being hit) if a user changes default value of EMACS.
@@ -164,7 +164,7 @@ ${SUBDIRS}:
         mkdir $@
         touch stamp-subdir
 
-TIT-SOURCES= \
+TIT_SOURCES= \
         ${srcdir}/CXTERM-DIC/4Corner.tit \
         ${srcdir}/CXTERM-DIC/ARRAY30.tit \
         ${srcdir}/CXTERM-DIC/CCDOSPY.tit \
@@ -179,15 +179,15 @@ TIT-SOURCES= \
         ${srcdir}/CXTERM-DIC/TONEPY.tit \
         ${srcdir}/CXTERM-DIC/ZOZY.tit
 
-${CHINESE-TIT:.elc=.el}: changed.tit
+${CHINESE_TIT:.elc=.el}: changed.tit
         @true
 
-changed.tit: ${TIT-SOURCES}
-        ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
+changed.tit: ${TIT_SOURCES}
+        ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
           -f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
           echo "changed" > $@
 
-MISC-SOURCES= \
+MISC_SOURCES= \
         ${srcdir}/MISC-DIC/CTLau-b5.html \
         ${srcdir}/MISC-DIC/CTLau.html \
         ${srcdir}/MISC-DIC/cangjie-table.b5 \
@@ -198,20 +198,20 @@ MISC-SOURCES= \
 ${MISC:.elc=.el}: changed.misc
         @true
 
-changed.misc: ${MISC-SOURCES}
-        ${RUN-EMACS} -l ${buildlisppath}/international/titdic-cnv \
+changed.misc: ${MISC_SOURCES}
+        ${RUN_EMACS} -l ${buildlisppath}/international/titdic-cnv \
           -f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
           echo "changed" > $@
 
-leim-list.el: ${SUBDIRS} ${TIT-MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
+leim-list.el: ${SUBDIRS} ${TIT_MISC} changed.tit changed.misc ${srcdir}/leim-ext.el
         rm -f leim-list.el
-        ${RUN-EMACS}  -l ${buildlisppath}/international/quail \
-          -f batch-byte-compile-if-not-done ${TIT-MISC:.elc=.el}
+        ${RUN_EMACS}  -l ${buildlisppath}/international/quail \
+          -f batch-byte-compile-if-not-done ${TIT_MISC:.elc=.el}
         if [ x`(cd ${srcdir} && /bin/pwd)` = x`(/bin/pwd)` ] ; then \
-          ${RUN-EMACS} -l ${buildlisppath}/international/quail \
+          ${RUN_EMACS} -l ${buildlisppath}/international/quail \
             --eval "(update-leim-list-file \".\")" ; \
         else \
-          ${RUN-EMACS} -l ${buildlisppath}/international/quail \
+          ${RUN_EMACS} -l ${buildlisppath}/international/quail \
             --eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \
         fi
         sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
@@ -264,7 +264,7 @@ install: all
         else true ; fi
 
 clean mostlyclean:
-        rm -f ${TIT-MISC} ${TIT-MISC:.elc=.el} \
+        rm -f ${TIT_MISC} ${TIT_MISC:.elc=.el} \
                 leim-list.el changed.tit changed.misc
 
 # The following target is needed because the `clean' target only removes
@@ -287,5 +287,5 @@ extraclean: maintainer-clean
 .PHONY: check-declare
 
 check-declare:
-        $(RUN-EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \
+        $(RUN_EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \
           --eval '(check-declare-directory "$(srcdir)")'