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 /make-dist | |
| 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 'make-dist')
| -rwxr-xr-x | make-dist | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/make-dist b/make-dist index 45df561ce13..6e85f1dc216 100755 --- a/make-dist +++ b/make-dist @@ -392,10 +392,10 @@ echo "Making links to \`m4'" echo "Making links to \`nt'" (cd nt - ln emacs-x86.manifest emacs-x64.manifest emacs.rc ../${tempdir}/nt - ln config.nt emacsclient.rc emacs-src.tags ../${tempdir}/nt + ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt + ln config.nt emacs-src.tags ../${tempdir}/nt ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt - ln Makefile.in gnulib.mk ../${tempdir}/nt + ln *.in gnulib.mk ../${tempdir}/nt ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) |