aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-11-22 14:04:32 -0800
committerGlenn Morris2014-11-22 14:07:48 -0800
commit84e2f13cd50a7ef6af736559107f0a8e6bcec6c5 (patch)
treec8b5f5424908cc820cc8e51c1669e889b15f3d7c /src
parent239cd5b62759b23020cb308d993b7e26933943d7 (diff)
downloademacs-84e2f13cd50a7ef6af736559107f0a8e6bcec6c5.tar.gz
emacs-84e2f13cd50a7ef6af736559107f0a8e6bcec6c5.zip
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 'src')
-rw-r--r--src/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index 7defb4d1a75..4bc5fdfaaf5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -549,7 +549,7 @@ $(top_srcdir)/aclocal.m4 $(top_srcdir)/configure config.in ../config.status \
549doc.o: buildobj.h 549doc.o: buildobj.h
550 550
551## This rule (and file) is duplicated in nt/: why? 551## This rule (and file) is duplicated in nt/: why?
552emacs.res: $(ntsource)/emacs.rc \ 552emacs.res: ../nt/emacs.rc \
553 $(ntsource)/icons/emacs.ico \ 553 $(ntsource)/icons/emacs.ico \
554 $(ntsource)/icons/hand.cur \ 554 $(ntsource)/icons/hand.cur \
555 $(ntsource)/$(EMACS_MANIFEST) 555 $(ntsource)/$(EMACS_MANIFEST)