From ae7bfbf5a46b6ab1b1bc4271e7941b6eb060641d Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 27 Jun 2013 03:40:46 +0200 Subject: [PATCH] Do not create locallisppath directories. * Makefile.in (install-arch-indep): Do not create directories passed with --enable-locallisppath. * etc/NEWS: Mention policy change with respect to locallisppath dirs. --- ChangeLog | 5 +++++ Makefile.in | 16 +++------------- etc/ChangeLog | 4 ++++ etc/NEWS | 3 +++ 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 @@ +2013-06-27 Juanma Barranquero + + * Makefile.in (install-arch-indep): Do not create directories passed + with --enable-locallisppath. + 2013-06-24 Glenn Morris * 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} \ ## Note that the Makefiles in the etc directory are potentially useful ## in an installed Emacs, so should not be excluded. -## I'm not sure creating locallisppath here serves any useful purpose. -## If it has the default value, then the later write_subdir commands -## will ensure all these components exist. -## This will only do something if locallisppath has a non-standard value. -## Is it really Emacs's job to create those directories? -## Should we also be ensuring they contain subdirs.el files? -## It would be easy to do, just use write_subdir. +## We used to create locallisppath, but if it points to non-standard +## locations, is not really Emacs's job to create these directories, +## so it is no longer done. ## Note that we use tar instead of plain old cp -R/-r because the latter ## is apparently not portable (even in 2012!). @@ -564,12 +560,6 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ ## See also these comments from 2004 about cp -r working fine: ## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA} - umask 022 ; \ - locallisppath='${locallisppath}'; \ - IFS=:; \ - for d in $$locallisppath; do \ - ${MKDIR_P} "$(DESTDIR)$$d"; \ - done -set ${COPYDESTS} ; \ unset CDPATH; \ $(set_installuser); \ diff --git a/etc/ChangeLog b/etc/ChangeLog index afaf1d71676..057125ea279 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2013-06-27 Juanma Barranquero + + * NEWS: Mention policy change with respect to locallisppath dirs. + 2013-06-18 Juanma Barranquero * 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 directories and will find the files in there automatically; there's no need to set any variables due to this change.) +** Directories passed to configure option `--enable-locallisppath' are +no longer created during installation. + * Startup Changes in Emacs 24.4 -- 2.39.2