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 /lib-src/Makefile.in | |
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 'lib-src/Makefile.in')
-rw-r--r-- | lib-src/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index eb16c3305ae..432314f02dd 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -388,7 +388,7 @@ update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ $< $(LOADLIBES) $(NTLIB) -o $@ -emacsclient.res: $(NTINC)/../emacsclient.rc ${srcdir}/icons/emacs.ico +emacsclient.res: ../nt/emacsclient.rc ${srcdir}/icons/emacs.ico $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ $< ## Makefile ends here. |