From 9f89ea1f84dbf708228ced0202774b36f30f2b01 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 23 May 2015 16:38:13 -0700 Subject: Remove charset map files from repository, generate in first bootstrap * admin/charsets/Makefile.in (${srcdir}/charsets.stamp): New. (all): Create the stamp file. (extraclean): Delete the stamp file. * src/Makefile.in (lispintdir, charsets): New variables. (${lispintdir}/cp51932.el, ${lispintdir}/eucjp-ms.el, ${charsets}): New rules. (emacs$(EXEEXT), temacs$(EXEEXT)): Depend on $charsets. * lisp/international/cp51932.el, lisp/international/eucjp-ms.el: * etc/charsets/*.map: Remove from repository. ; * admin/charsets/mapconv: Fix typo in output comment. ; * etc/charsets/README: Small update. ; * .gitignore: Update for charset changes. --- admin/charsets/Makefile.in | 7 +++++-- admin/charsets/mapconv | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'admin/charsets') diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index 5d06775dc35..a5e7212f163 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in @@ -106,7 +106,10 @@ CHARSETS := $(addprefix ${charsetdir}/,${CHARSETS}) .PHONY: all -all: ${CHARSETS} ${TRANS_TABLE} +all: ${srcdir}/charsets.stamp + +${srcdir}/charsets.stamp: ${CHARSETS} ${TRANS_TABLE} + ${AM_V_GEN}echo timestamp > $@ ## Rules for each charset. @@ -315,4 +318,4 @@ maintainer-clean: distclean ## Do not remove these files, even in a bootstrap. They rarely change. extraclean: - rm -f ${CHARSETS} ${TRANS_TABLE} + rm -f ${CHARSETS} ${TRANS_TABLE} ${srcdir}/charsets.stamp diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index 245dce114a0..32ba6421a86 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv @@ -47,7 +47,7 @@ AWK=${AWK:-awk} case "$3" in GLIBC*) - FILE="$BASE in localedate/charmaps of glibc"; + FILE="$BASE in localedata/charmaps of glibc"; SOURCE="";; CZYBORRA) BASE="$BASE.gz"; -- cgit v1.2.1