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

* Makefile.in (install-arch-indep): Handle space in locallisppath.

Browse source 
* src/lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
setting sitelisp.

Fixes: debbugs:12010
This commit is contained in:
Jan Djärv 2012-07-29 18:55:02 +02:00
parent bb6eb9fcbd
commit ffd817eb10
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-07-29 Jan Djärv <jan.h.d@swipnet.se>
* Makefile.in (install-arch-indep): Handle space in locallisppath.
2012-07-28 Paul Eggert <eggert@cs.ucla.edu>
Use Gnulib environ module (Bug#9772).

9
Makefile.in
View file

@ -285,9 +285,9 @@ removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
# to just letting configure generate epaths.h from epaths.in in a
# similar way to how Makefile is made from Makefile.in.
epaths-force: FRC
@(standardlisppath=`echo ${standardlisppath} | ${removenullpaths}` ; \
locallisppath=`echo ${locallisppath} | ${removenullpaths}` ; \
buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \
@(standardlisppath=`echo "${standardlisppath}" | ${removenullpaths}` ; \
locallisppath=`echo "${locallisppath}" | ${removenullpaths}` ; \
buildlisppath=`echo "${buildlisppath}" | ${removenullpaths}` ; \
x_default_search_path=`echo ${x_default_search_path}`; \
gamedir=`echo ${gamedir}`; \
sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \
@ -489,7 +489,8 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
install-arch-indep: install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
umask 022 ; \
$(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
eval sh -x $(MKDIR_P) \
"'$(DESTDIR)`echo ${locallisppath}|sed \"s,:,' '$(DESTDIR),g\"`'"
-set ${COPYDESTS} ; \
unset CDPATH; \
$(set_installuser); \

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-07-29 Jan Djärv <jan.h.d@swipnet.se>
* lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
setting sitelisp (Bug#12010).
2012-07-29 Eli Zaretskii <eliz@gnu.org>
* w32heap.h (OS_9X): Renamed from OS_WINDOWS_95.

10
src/lread.c
View file

@ -4121,12 +4121,7 @@ init_lread (void)
difference between initialized and !initialized in this case,
so we'll have to do it unconditionally when Vinstallation_directory
is non-nil. */
#ifdef HAVE_NS
/* loadpath already includes the app-bundle's site-lisp. */
if (!no_site_lisp && !egetenv ("EMACSLOADPATH") && !loadpath)
#else
if (!no_site_lisp && !egetenv ("EMACSLOADPATH"))
#endif
{
Lisp_Object sitelisp;
sitelisp = decode_env_path (0, PATH_SITELOADSEARCH);
@ -4270,12 +4265,7 @@ init_lread (void)
load_path_check ();
/* Add the site-lisp directories at the front. */
#ifdef HAVE_NS
/* loadpath already includes the app-bundle's site-lisp. */
if (!no_site_lisp && !loadpath)
#else
if (!no_site_lisp)
#endif
{
Lisp_Object sitelisp;
sitelisp = decode_env_path (0, PATH_SITELOADSEARCH);