diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2011-01-31 21:36:08 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2011-01-31 21:36:08 +0200 |
| commit | 70b0d280eb5cfdf103603fb289064710ae7cd680 (patch) | |
| tree | 39963bbb02985fa36b64cf93dda48e8efbd7823a /admin | |
| parent | 1dc4075fa8809805aed5092e93e225e889725c94 (diff) | |
| download | emacs-70b0d280eb5cfdf103603fb289064710ae7cd680.tar.gz | |
Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu.
lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
$(BLD)/time_r.$(O).
($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
$(EMACS_ROOT)/src/m/intel386.h.
($(BLD)/strftime.$(O)):
($(BLD)/time_r.$(O)): Define prerequisites.
src/makefile.w32-in (OBJ2): Remove strftime.$(O).
($(BLD)/strftime.$(O)): Remove prerequisites.
lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
(ECLIENT_CFLAGS): Remove -DVERSION.
($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
nt/config.nt (VERSION): Uncomment definition.
(restrict): Define.
nt/inc/stdbool.h: New file.
admin/admin.el (set-version): Remove lib-src/makefile.w32-in. Add
nt/config.nt.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/admin.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 6f2ac5d67d5..f7d60b08e4c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2011-01-31 Eli Zaretskii <eliz@gnu.org> + + * admin.el (set-version): Remove lib-src/makefile.w32-in. Add + nt/config.nt. + 2011-01-31 Paul Eggert <eggert@cs.ucla.edu> src/emacs.c now gets version number from configure.in diff --git a/admin/admin.el b/admin/admin.el index 739c769b352..9f87e9b2590 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -73,8 +73,9 @@ Root must be the root of an Emacs source tree." (rx (and ".TH EMACS" (1+ not-newline) "GNU Emacs" (1+ space) (submatch (1+ (in "0-9.")))))) - (set-version-in-file root "lib-src/makefile.w32-in" version - (rx (and "VERSION" (0+ space) "=" (0+ space) + (set-version-in-file root "nt/config.nt" version + (rx (and bol "#" (0+ blank) "define" (1+ blank) + "VERSION" (1+ blank) (submatch (1+ (in "0-9.")))))) (set-version-in-file root "nt/makefile.w32-in" version (rx (and "VERSION" (0+ space) "=" (0+ space) |