diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2012-07-29 18:55:02 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2012-07-29 18:55:02 +0200 |
| commit | ffd817eb10bd5e4ad1bf693fc2ebdffd25dea874 (patch) | |
| tree | 17249090e7e077099b4d9106f44f05050669ee5c | |
| parent | bb6eb9fcbd3ce25724ce3823132fa5d758a5ade1 (diff) | |
* Makefile.in (install-arch-indep): Handle space in locallisppath.
* src/lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
setting sitelisp.
Fixes: debbugs:12010
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 9 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lread.c | 10 |
4 files changed, 14 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index f9546f9e056..82b4e7fd15c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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). diff --git a/Makefile.in b/Makefile.in index 95b0931087f..c6df480ce7c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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); \ diff --git a/src/ChangeLog b/src/ChangeLog index aba9846f6a6..d6143d15bde 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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. diff --git a/src/lread.c b/src/lread.c index 39378bb11dd..0db37d7492f 100644 --- a/src/lread.c +++ b/src/lread.c @@ -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); |