aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-12-10 18:32:10 -0800
committerGlenn Morris2010-12-10 18:32:10 -0800
commit7470c6f07f7df4a9ac4079753591477abb46c867 (patch)
tree4216a16ae6dd28fb9b8d8c6313bb686e64f70661
parent0b9fc69a7651c4a36ab4616f5f7d1c2f48fed783 (diff)
downloademacs-7470c6f07f7df4a9ac4079753591477abb46c867.tar.gz
emacs-7470c6f07f7df4a9ac4079753591477abb46c867.zip
[Backport from trunk]: * make-dist: Exclude etc/*.pyc.
-rw-r--r--ChangeLog4
-rwxr-xr-xmake-dist2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a6b47ed9415..51cfab5906c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12010-12-11 Glenn Morris <rgm@gnu.org>
2
3 * make-dist: Exclude etc/*.pyc. [Backport from trunk]
4
12010-11-13 Dan Nicolaescu <dann@ics.uci.edu> 52010-11-13 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 Fix alloca definition when using gcc on non-gnu systems. 7 Fix alloca definition when using gcc on non-gnu systems.
diff --git a/make-dist b/make-dist
index 5e81da5d70f..fe022f523f1 100755
--- a/make-dist
+++ b/make-dist
@@ -602,7 +602,7 @@ echo "Making links to \`etc'"
602 fi 602 fi
603 done 603 done
604 cd ../${tempdir}/etc 604 cd ../${tempdir}/etc
605 rm -f fns*.el 605 rm -f fns*.el *.pyc
606 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core 606 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
607 rm -f TAGS) 607 rm -f TAGS)
608 608