diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-11-22 14:04:32 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-11-22 14:07:48 -0800 |
| commit | 84e2f13cd50a7ef6af736559107f0a8e6bcec6c5 (patch) | |
| tree | c8b5f5424908cc820cc8e51c1669e889b15f3d7c /configure.ac | |
| parent | 239cd5b62759b23020cb308d993b7e26933943d7 (diff) | |
| download | emacs-84e2f13cd50a7ef6af736559107f0a8e6bcec6c5.tar.gz | |
Further reduce number of versioned files storing Emacs version number.
* configure.ac (comma_version, comma_space_version) [mingw32]:
New output variables.
(nt/emacs.rc, nt/emacsclient.rc) [mingw32]: New output files.
* make-dist: Update nt/ for *.rc -> *.rc.in changes.
* nt/emacs.rc.in, nt/emacsclient.rc.in: Rename from nt/emacs.rc, emacsclient.rc.
Let configure generate the real files, and set the version numbers.
* lib-src/Makefile.in (emacsclient.res): Update deps for nt/emacsclient.rc
now being in the build directory, not the source directory.
* nt/Makefile.in (distclean): Delete *.rc.
(emacs.res): Update deps for nt/emacsclient.rc now being in the
build directory, not the source directory.
* admin/admin.el (set-version): No more need to update nt/*.rc.
* admin/authors.el (authors-renamed-files-alist): Add .rc.in files.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5d71c2f6a6e..85d11234035 100644 --- a/configure.ac +++ b/configure.ac @@ -4679,6 +4679,15 @@ AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure case $opsys in mingw32) AC_DEFINE(config_opsysfile, <ms-w32.h>, []) + + dnl Construct something of the form "24,4,0,0" with 4 components. + comma_version=`echo "$version.0.0" | sed -e 's/\./,/g' -e 's/^\([[^,]]*,[[^,]]*,[[^,]]*,[[^,]]*\).*/\1/'` + + comma_space_version=`echo "$comma_version" | sed 's/,/, /g'` + + AC_SUBST(comma_version) + AC_SUBST(comma_space_version) + AC_CONFIG_FILES([nt/emacs.rc nt/emacsclient.rc]) ;; esac |