diff options
| author | Glenn Morris <rgm@gnu.org> | 2015-05-21 23:44:00 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2015-05-21 23:44:00 -0700 |
| commit | e7bc85db46679cc408f51d74e6a66734f1e32142 (patch) | |
| tree | 250008ff1c624cb5cc39ceb2fcf7892cdb93c258 /configure.ac | |
| parent | 9e41e0bc6a6fdb7a01841db62d8de42d67be534a (diff) | |
| download | emacs-e7bc85db46679cc408f51d74e6a66734f1e32142.tar.gz | |
Generate admin/charsets Makefile via configure, and make more portable.
* configure.ac (SUBDIR_MAKEFILES): Add admin/charsets/Makefile.
(admin/charsets/Makefile): Generate it.
* admin/charsets/Makefile.in: Rename from Makefile.
(AWK, srcdir, top_srcdir, AM_DEFAULT_VERBOSITY):
New variables, set by configure.
(charsetdir, lispintdir, mapfiledir, AM_V_GEN, am__v_GEN_)
(am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
(am__v_at_1, LOCAL, mapconv, run_mapconv, big5, compact, cp51932)
(cp932, eucjp_ms, gb180302, gb180304, kuten): New variables.
(TRANS_TABLE, CHARSETS): Add directory prefix to value.
(all): Declare PHONY.
(local): New PHONY target.
(map_template): New template. Use to define short PHONY aliases.
(*.map): Add directory prefixes to targets and prerequisites.
Respect make verbosity.
(JISC6226.map): Replace non-portable sed append without newline.
(install): Remove rule.
(clean): Only delete temporary sedscript.
(bootstrap-clean, distclean, maintainer-clean, extraclean)
(totalclean): New PHONY rules.
* admin/charsets/mapconv (BASE): Replace basename with expr.
(FILE): Add "mapfiles" subdirectory.
(AWK): New variable. Use throughout in place of "awk".
(main): Use "gunzip -c" in place of "zcat".
Don't leave whitespace before "p", for older sed.
* admin/charsets/mapfiles/PTCP154: Add final newline,
to make older sed versions happy.
; * .gitignore: Ignore admin/charsets/Makefile.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1cddeb1e45f..752204c3a8c 100644 --- a/configure.ac +++ b/configure.ac @@ -5247,7 +5247,8 @@ fi dnl The admin/ directory used to be excluded from tarfiles. if test -d $srcdir/admin; then - SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/unidata/Makefile admin/grammars/Makefile" + SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES admin/charsets/Makefile admin/unidata/Makefile admin/grammars/Makefile" + AC_CONFIG_FILES([admin/charsets/Makefile]) AC_CONFIG_FILES([admin/unidata/Makefile]) AC_CONFIG_FILES([admin/grammars/Makefile]) fi dnl -d admin |