aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Scholtes2012-02-05 13:56:41 -0700
committerChristoph Scholtes2012-02-05 13:56:41 -0700
commit3e44c7824fbd6bdc2396d89637f6760c70d9be39 (patch)
tree01fbfe68dc452f21fbf33710b8eb9fb7793aad90
parent7519763363bcb835f5387784bce5251ea1beb71e (diff)
downloademacs-3e44c7824fbd6bdc2396d89637f6760c70d9be39.tar.gz
emacs-3e44c7824fbd6bdc2396d89637f6760c70d9be39.zip
* make-dist (README.W32): Include file in source tarball.
* nt/README.W32: Clarification for inclusion in source tarball.
-rw-r--r--ChangeLog2
-rwxr-xr-xmake-dist3
-rw-r--r--nt/ChangeLog2
-rw-r--r--nt/README.W3213
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 @@
12012-02-05 Christoph Scholtes <cschol2112@googlemail.com> 12012-02-05 Christoph Scholtes <cschol2112@googlemail.com>
2 2
3 * make-dist (README.W32): Include file in source tarball.
4
3 * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform 5 * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform
4 specific makefiles to support getopt_.h generation with MSVC. 6 specific makefiles to support getopt_.h generation with MSVC.
5 7
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'"
398(cd m4 398(cd m4
399 ln *.m4 ../${tempdir}/m4) 399 ln *.m4 ../${tempdir}/m4)
400 400
401## Exclude README.W32 because it is specific to pre-built binaries(?).
402echo "Making links to \`nt'" 401echo "Making links to \`nt'"
403(cd nt 402(cd nt
404 ln emacs.manifest emacs.rc emacsclient.rc config.nt ../${tempdir}/nt 403 ln emacs.manifest emacs.rc emacsclient.rc config.nt ../${tempdir}/nt
405 ln emacs-src.tags nmake.defs gmake.defs subdirs.el ../${tempdir}/nt 404 ln emacs-src.tags nmake.defs gmake.defs subdirs.el ../${tempdir}/nt
406 ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt 405 ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
407 ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) 406 ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt)
408 407
409echo "Making links to \`nt/inc' and its subdirectories" 408echo "Making links to \`nt/inc' and its subdirectories"
410for f in `find nt/inc -type f -name '[a-z]*.h'`; do 409for 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 @@
12012-02-05 Christoph Scholtes <cschol2112@googlemail.com> 12012-02-05 Christoph Scholtes <cschol2112@googlemail.com>
2 2
3 * README.W32: Clarification for inclusion in source tarball.
4
3 * gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC. 5 * gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.
4 6
5 * nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC. 7 * 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.
3 3
4 Emacs for Windows 4 Emacs for Windows
5 5
6 This README file describes how to set up and run a precompiled 6 This README.W32 file describes how to set up and run a precompiled
7 version of GNU Emacs for Windows. This distribution can be found on 7 distribution of GNU Emacs for Windows. You can find the precompiled
8 the ftp.gnu.org server and its mirrors: 8 distribution on the ftp.gnu.org server and its mirrors:
9 9
10 ftp://ftp.gnu.org/gnu/emacs/windows/ 10 ftp://ftp.gnu.org/gnu/emacs/windows/
11 11
12 This server contains other distributions, including the full Emacs 12 This server contains other distributions, including the full Emacs
13 source distribution and a barebin distribution which can be installed 13 source distribution and a barebin distribution which can be installed
14 over it, as well as older releases of Emacs for Windows. 14 over it, as well as older releases of Emacs for Windows.
15 15
16 Information on how to compile Emacs from sources on Windows is in
17 the files README and INSTALL in this directory. If you received
18 this file as part of the Emacs source distribution, please read
19 those 2 files and not this one.
20
16 Answers to frequently asked questions, and further information about 21 Answers to frequently asked questions, and further information about
17 this port of GNU Emacs and related software packages can be found via 22 this port of GNU Emacs and related software packages can be found via
18 http: 23 http: