[Emacs-diffs] /srv/bzr/emacs/trunk r109267: * Makefile.in (install-arch-indep): Handle space in locallisppath.

[Jan D.]

------------------------------------------------------------
revno: 109267
fixes bug: http://debbugs.gnu.org/12010
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2012-07-29 18:55:02 +0200
message:
  * Makefile.in (install-arch-indep): Handle space in locallisppath.
  
  * src/lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
  setting sitelisp.
modified:
  ChangeLog
  Makefile.in
  src/ChangeLog
  src/lread.c

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-28 23:05:32 +0000
+++ b/ChangeLog 2012-07-29 16:55:02 +0000
@@ -1,3 +1,7 @@
+2012-07-29  Jan Djärv  <address@hidden>
+
+       * Makefile.in (install-arch-indep): Handle space in locallisppath.
+
 2012-07-28  Paul Eggert  <address@hidden>
 
        Use Gnulib environ module (Bug#9772).

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-07-09 04:52:49 +0000
+++ b/Makefile.in       2012-07-29 16:55:02 +0000
@@ -285,9 +285,9 @@
 # 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 @@
 ## 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); \

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-29 16:22:27 +0000
+++ b/src/ChangeLog     2012-07-29 16:55:02 +0000
@@ -1,3 +1,8 @@
+2012-07-29  Jan Djärv  <address@hidden>
+
+       * lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
+       setting sitelisp (Bug#12010).
+
 2012-07-29  Eli Zaretskii  <address@hidden>
 
        * w32heap.h (OS_9X): Renamed from OS_WINDOWS_95.

=== modified file 'src/lread.c'
--- a/src/lread.c       2012-07-12 03:45:46 +0000
+++ b/src/lread.c       2012-07-29 16:55:02 +0000
@@ -4121,12 +4121,7 @@
    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 @@
           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);