aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in16
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/NEWS3
4 files changed, 15 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index d111394a9b6..8a61bd42712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12013-06-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * Makefile.in (install-arch-indep): Do not create directories passed
4 with --enable-locallisppath.
5
12013-06-24 Glenn Morris <rgm@fencepost.gnu.org> 62013-06-24 Glenn Morris <rgm@fencepost.gnu.org>
2 7
3 * configure.ac: Include X11/X.h when testing for Xft.h. (Bug#14684) 8 * configure.ac: Include X11/X.h when testing for Xft.h. (Bug#14684)
diff --git a/Makefile.in b/Makefile.in
index de406453983..4afe6746cfc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -548,13 +548,9 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
548## Note that the Makefiles in the etc directory are potentially useful 548## Note that the Makefiles in the etc directory are potentially useful
549## in an installed Emacs, so should not be excluded. 549## in an installed Emacs, so should not be excluded.
550 550
551## I'm not sure creating locallisppath here serves any useful purpose. 551## We used to create locallisppath, but if it points to non-standard
552## If it has the default value, then the later write_subdir commands 552## locations, is not really Emacs's job to create these directories,
553## will ensure all these components exist. 553## so it is no longer done.
554## This will only do something if locallisppath has a non-standard value.
555## Is it really Emacs's job to create those directories?
556## Should we also be ensuring they contain subdirs.el files?
557## It would be easy to do, just use write_subdir.
558 554
559## Note that we use tar instead of plain old cp -R/-r because the latter 555## Note that we use tar instead of plain old cp -R/-r because the latter
560## is apparently not portable (even in 2012!). 556## is apparently not portable (even in 2012!).
@@ -564,12 +560,6 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
564## See also these comments from 2004 about cp -r working fine: 560## See also these comments from 2004 about cp -r working fine:
565## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html 561## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
566install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} 562install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
567 umask 022 ; \
568 locallisppath='${locallisppath}'; \
569 IFS=:; \
570 for d in $$locallisppath; do \
571 ${MKDIR_P} "$(DESTDIR)$$d"; \
572 done
573 -set ${COPYDESTS} ; \ 563 -set ${COPYDESTS} ; \
574 unset CDPATH; \ 564 unset CDPATH; \
575 $(set_installuser); \ 565 $(set_installuser); \
diff --git a/etc/ChangeLog b/etc/ChangeLog
index afaf1d71676..057125ea279 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12013-06-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * NEWS: Mention policy change with respect to locallisppath dirs.
4
12013-06-18 Juanma Barranquero <lekktu@gmail.com> 52013-06-18 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * NEWS: Document new Prettify Symbols mode. 7 * NEWS: Document new Prettify Symbols mode.
diff --git a/etc/NEWS b/etc/NEWS
index 8df6153e808..f94db746926 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -57,6 +57,9 @@ files are in share/emacs/VERSION/etc. (Emacs knows about all these
57directories and will find the files in there automatically; there's no 57directories and will find the files in there automatically; there's no
58need to set any variables due to this change.) 58need to set any variables due to this change.)
59 59
60** Directories passed to configure option `--enable-locallisppath' are
61no longer created during installation.
62
60 63
61* Startup Changes in Emacs 24.4 64* Startup Changes in Emacs 24.4
62 65