aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES4
-rw-r--r--admin/admin.el3
2 files changed, 5 insertions, 2 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 5e6146b33d8..487c1501bb9 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -21,7 +21,7 @@ WINDOWSNT Compiling the native MS-Windows (W32) port.
21__MINGW32__ Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC. 21__MINGW32__ Compiling the W32 port with the MinGW or MinGW-w64 ports of GCC.
22_MSC_VER Compiling the W32 port with the Microsoft C compiler. 22_MSC_VER Compiling the W32 port with the Microsoft C compiler.
23MINGW_W64 Compiling the W32 port with the MinGW-w64 port of GCC. 23MINGW_W64 Compiling the W32 port with the MinGW-w64 port of GCC.
24DARWIN_OS Compiling on Mac OS X or pure Darwin (and using s/darwin.h). 24DARWIN_OS Compiling on macOS or pure Darwin (and using s/darwin.h).
25SOLARIS2 25SOLARIS2
26USG 26USG
27USG5_4 27USG5_4
@@ -29,7 +29,7 @@ USG5_4
29** Distinguishing GUIs ** 29** Distinguishing GUIs **
30 30
31HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars. 31HAVE_NTGUI Use the native W32 GUI for windows, frames, menus&scrollbars.
32HAVE_NS Use the NeXT/OpenStep/Cocoa UI under Mac OS X or GNUstep. 32HAVE_NS Use the NeXT/OpenStep/Cocoa UI under macOS or GNUstep.
33NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API. 33NS_IMPL_GNUSTEP Compile support for GNUstep implementation of NS GUI API.
34NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API. 34NS_IMPL_COCOA Compile support for Cocoa (Apple) implementation of NS GUI API.
35HAVE_X11 Compile support for the X11 GUI. 35HAVE_X11 Compile support for the X11 GUI.
diff --git a/admin/admin.el b/admin/admin.el
index 4af1ff9003a..9f3b68e0bb9 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -109,6 +109,9 @@ Root must be the root of an Emacs source tree."
109 (rx (and "AC_INIT" (1+ (not (in ?,))) 109 (rx (and "AC_INIT" (1+ (not (in ?,)))
110 ?, (0+ space) 110 ?, (0+ space)
111 (submatch (1+ (in "0-9.")))))) 111 (submatch (1+ (in "0-9."))))))
112 (set-version-in-file root "nt/README.W32" version
113 (rx (and "version" (1+ space)
114 (submatch (1+ (in "0-9."))))))
112 ;; TODO: msdos could easily extract the version number from 115 ;; TODO: msdos could easily extract the version number from
113 ;; configure.ac with sed, rather than duplicating the information. 116 ;; configure.ac with sed, rather than duplicating the information.
114 (set-version-in-file root "msdos/sed2v2.inp" version 117 (set-version-in-file root "msdos/sed2v2.inp" version