From 3e44c7824fbd6bdc2396d89637f6760c70d9be39 Mon Sep 17 00:00:00 2001 From: Christoph Scholtes Date: Sun, 5 Feb 2012 13:56:41 -0700 Subject: [PATCH] * make-dist (README.W32): Include file in source tarball. * nt/README.W32: Clarification for inclusion in source tarball. --- ChangeLog | 2 ++ make-dist | 3 +-- nt/ChangeLog | 2 ++ nt/README.W32 | 13 +++++++++---- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f36c25ba5a1..57476bbc791 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-02-05 Christoph Scholtes + * make-dist (README.W32): Include file in source tarball. + * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform specific makefiles to support getopt_.h generation with MSVC. diff --git a/make-dist b/make-dist index d1d80097824..55dac98d713 100755 --- a/make-dist +++ b/make-dist @@ -398,13 +398,12 @@ echo "Making links to \`m4'" (cd m4 ln *.m4 ../${tempdir}/m4) -## Exclude README.W32 because it is specific to pre-built binaries(?). echo "Making links to \`nt'" (cd nt ln emacs.manifest emacs.rc emacsclient.rc config.nt ../${tempdir}/nt ln emacs-src.tags nmake.defs gmake.defs subdirs.el ../${tempdir}/nt ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt - ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) + ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) echo "Making links to \`nt/inc' and its subdirectories" for f in `find nt/inc -type f -name '[a-z]*.h'`; do diff --git a/nt/ChangeLog b/nt/ChangeLog index f34fe11084c..d696b88abb4 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,5 +1,7 @@ 2012-02-05 Christoph Scholtes + * README.W32: Clarification for inclusion in source tarball. + * gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC. * nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC. diff --git a/nt/README.W32 b/nt/README.W32 index 8f33dee2d9b..fa9a01939c5 100644 --- a/nt/README.W32 +++ b/nt/README.W32 @@ -3,16 +3,21 @@ See the end of the file for license conditions. Emacs for Windows - This README file describes how to set up and run a precompiled - version of GNU Emacs for Windows. This distribution can be found on - the ftp.gnu.org server and its mirrors: + This README.W32 file describes how to set up and run a precompiled + distribution of GNU Emacs for Windows. You can find the precompiled + distribution on the ftp.gnu.org server and its mirrors: - ftp://ftp.gnu.org/gnu/emacs/windows/ + ftp://ftp.gnu.org/gnu/emacs/windows/ This server contains other distributions, including the full Emacs source distribution and a barebin distribution which can be installed over it, as well as older releases of Emacs for Windows. + Information on how to compile Emacs from sources on Windows is in + the files README and INSTALL in this directory. If you received + this file as part of the Emacs source distribution, please read + those 2 files and not this one. + Answers to frequently asked questions, and further information about this port of GNU Emacs and related software packages can be found via http: -- 2.39.2