procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-20 08:46:50 +02:00
commit a5bc95171a
4 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-20 Glenn Morris <rgm@gnu.org>
* Makefile.in (distclean, bootstrap-clean, maintainer-clean):
Clean test/automated if present.
2013-08-19 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:

6
Makefile.in
View file

@ -859,6 +859,8 @@ distclean: FRC
(cd leim; $(MAKE) $(MFLAGS) distclean)
(cd lisp; $(MAKE) $(MFLAGS) distclean)
(cd nextstep && $(MAKE) $(MFLAGS) distclean)
[ ! -d test/automated ] || \
cd test/automated && $(MAKE) $(MFLAGS) distclean
${top_distclean}
### `bootstrap-clean'
@ -878,6 +880,8 @@ bootstrap-clean: FRC
(cd leim; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
(cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean)
[ ! -d test/automated ] || \
cd test/automated && $(MAKE) $(MFLAGS) bootstrap-clean
[ ! -f config.log ] || mv -f config.log config.log~
${top_bootclean}
@ -898,6 +902,8 @@ top_maintainer_clean=\
maintainer-clean: bootstrap-clean FRC
(cd src; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lisp; $(MAKE) $(MFLAGS) maintainer-clean)
[ ! -d test/automated ] || \
cd test/automated && $(MAKE) $(MFLAGS) maintainer-clean
${top_maintainer_clean}
### This doesn't actually appear in the coding standards, but Karl

0
test/automated/package-test.el Executable file → Normal file
View file

0
test/automated/package-x-test.el Executable file → Normal file
View file