diff options
| author | Eli Zaretskii | 2011-02-19 21:56:29 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2011-02-19 21:56:29 +0200 |
| commit | 615d868ee6add5d37db574d266f0d166c2f16bb8 (patch) | |
| tree | abf530e19e9273272afaa4064ffd74ea67857dd5 /admin | |
| parent | 67ab0163d67fbfeb41c37c8a259f27eeef965520 (diff) | |
| parent | 83627c032a6c07c15cc0434b23514f34d9583685 (diff) | |
| download | emacs-615d868ee6add5d37db574d266f0d166c2f16bb8.tar.gz emacs-615d868ee6add5d37db574d266f0d166c2f16bb8.zip | |
Adapt and fix the MS-DOS port due to gnulib imports.
msdos/depfiles.bat: New file.
msdos/sedlibmk.inp: New file.
msdos/sedlibcf.inp: New file.
msdos/sedleim.inp (RUN_EMACS): Rename from RUN-EMACS.
(BUILT_EMACS): Rename from BUILT-EMACS.
msdos/sed6.inp (MAKEINFO): Edit to "makeinfo".
(ENVADD): Adjust to MAKEINFO_OPTS.
(texinputdir): Don't edit.
msdos/sed3v2.inp (-DVERSION): Edit out.
(LOADLIBES): Don't edit to empty.
msdos/sed2v2.inp: Remove workaround for the "#if ! HAVE_MKTIME ||
BROKEN_MKTIME" stuff -- it's no longer in src/config.in.
(HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
(HAVE__BOOL): Edit to 1.
(VERSION, inline, restrict): Edit for DJGPP.
(my_strftime): Edit to nstrftime.
msdos/sed1v2.inp (NS_OBJC_OBJ): Edit to empty.
(@true): Edit to "@rem".
(move-if-change): Edit to "update".
(echo): Edit to "djecho".
(cd $(lib) && ...): Edit to "$(MAKE) -C ...".
(LIBOBJS): Edit to empty.
($(libsrc)/make-docfile): Two new edits, one each for every
invocation of make-docfile.
(move-if-change): Fix edit.
Remove some unused switches from $(ALL_CFLAGS), to make the GCC
command line shorter.
msdos/mainmake.v2 (version): Remove, no longer needed (config.in
defines VERSION).
(all): Add lib.
(lib): New target and recipe.
(lib-src): Depend on lib.
(src): Depend on lib and lib-src.
(clean, mostlyclean, distclean, maintainer-clean, extraclean)
(bootstrap-clean): Recurse into lib.
(lib, lib-src, src): Specify "all" as an explicit target.
.bzrignore: Ignore cxxdefs.h and lib/*.in-h files.
Add lib/deps/.
config.bat: Configure in `lib'.
Generate *.Po files in lib/deps.
src/termcap.c (tputs): Don't declare baud_rate.
src/s/msdos.h (strtold): Define to _strtold.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 4 | ||||
| -rw-r--r-- | admin/admin.el | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 64d6de69d10..87ba151dc34 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-02-19 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * admin.el (set-version): Add msdos/sed2v2.inp. | ||
| 4 | |||
| 1 | 2011-02-16 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2011-02-16 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Remove no-longer needed getloadavg symbols. | 7 | Remove no-longer needed getloadavg symbols. |
diff --git a/admin/admin.el b/admin/admin.el index 9f87e9b2590..717bfee702d 100644 --- a/admin/admin.el +++ b/admin/admin.el | |||
| @@ -77,6 +77,10 @@ Root must be the root of an Emacs source tree." | |||
| 77 | (rx (and bol "#" (0+ blank) "define" (1+ blank) | 77 | (rx (and bol "#" (0+ blank) "define" (1+ blank) |
| 78 | "VERSION" (1+ blank) | 78 | "VERSION" (1+ blank) |
| 79 | (submatch (1+ (in "0-9.")))))) | 79 | (submatch (1+ (in "0-9.")))))) |
| 80 | (set-version-in-file root "msdos/sed2v2.inp" version | ||
| 81 | (rx (and bol "/^#undef " (1+ not-newline) | ||
| 82 | "define VERSION" (1+ space) | ||
| 83 | (submatch (1+ (in "0-9.")))))) | ||
| 80 | (set-version-in-file root "nt/makefile.w32-in" version | 84 | (set-version-in-file root "nt/makefile.w32-in" version |
| 81 | (rx (and "VERSION" (0+ space) "=" (0+ space) | 85 | (rx (and "VERSION" (0+ space) "=" (0+ space) |
| 82 | (submatch (1+ (in "0-9.")))))) | 86 | (submatch (1+ (in "0-9.")))))) |