aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-02-12 18:04:18 -0800
committerGlenn Morris2011-02-12 18:04:18 -0800
commit57e96f8e22b8d05a498be8f73366c8554c1b68e5 (patch)
tree26f0a62292efb30bd2cf7d6b7a7b7d2ba91dbc72
parent3c65e88d79763a0c36634bda79271982634eaa80 (diff)
downloademacs-57e96f8e22b8d05a498be8f73366c8554c1b68e5.tar.gz
emacs-57e96f8e22b8d05a498be8f73366c8554c1b68e5.zip
* make-dist: Exclude generated file src/globals.h.
-rw-r--r--ChangeLog4
-rwxr-xr-xmake-dist2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2a0dd144670..9dcdff187a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12011-02-13 Glenn Morris <rgm@gnu.org>
2
3 * make-dist: Exclude generated file src/globals.h.
4
12011-02-10 Paul Eggert <eggert@cs.ucla.edu> 52011-02-10 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses. 7 * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
diff --git a/make-dist b/make-dist
index 37e0fb3e641..ee0efb04c3a 100755
--- a/make-dist
+++ b/make-dist
@@ -359,7 +359,7 @@ echo "Making links to \`src'"
359 ln makefile.w32-in ../${tempdir}/src 359 ln makefile.w32-in ../${tempdir}/src
360 ln .gdbinit .dbxinit ../${tempdir}/src 360 ln .gdbinit .dbxinit ../${tempdir}/src
361 cd ../${tempdir}/src 361 cd ../${tempdir}/src
362 rm -f config.h epaths.h Makefile buildobj.h) 362 rm -f globals.h config.h epaths.h Makefile buildobj.h)
363 363
364echo "Making links to \`src/bitmaps'" 364echo "Making links to \`src/bitmaps'"
365(cd src/bitmaps 365(cd src/bitmaps