summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-05-17 22:21:24 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-05-17 22:21:24 -0700
commitbfbe26276d04b1e8aeaec21fea7573ac1135d521 (patch)
tree1df0eb66ad724ead5a1d278e3c240558445a5010
parentf6f87d33dab8a26270682d494a8ce778b7c1ca15 (diff)
downloademacs-bfbe26276d04b1e8aeaec21fea7573ac1135d521.tar.gz
* make-dist (files): Add nt/Makefile.in, nt/gnulib.mk.
Otherwise, 'configure; make' fails on non-Windows builds.
-rw-r--r--ChangeLog5
-rwxr-xr-xmake-dist1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f47d2b70585..280aa2fbc4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-18 Paul Eggert <eggert@cs.ucla.edu>
+
+ * make-dist (files): Add nt/Makefile.in, nt/gnulib.mk.
+ Otherwise, 'configure; make' fails on non-Windows builds.
+
2013-05-16 Eli Zaretskii <eliz@gnu.org>
* lib/Makefile.am: If building for MS-Windows, include
diff --git a/make-dist b/make-dist
index b82a3cba9d2..55ef45740e3 100755
--- a/make-dist
+++ b/make-dist
@@ -389,6 +389,7 @@ echo "Making links to \`nt'"
ln emacs-x86.manifest emacs-x64.manifest emacs.rc ../${tempdir}/nt
ln config.nt emacsclient.rc emacs-src.tags ../${tempdir}/nt
ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
+ ln Makefile.in gnulib.mk ../${tempdir}/nt
ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt)
echo "Making links to \`nt/inc' and its subdirectories"