[Q21.5] Sync canna_api load/install paths

[Michael Sperber]

"Stephen J. Turnbull" <stephen at xemacs.org> writes:

> Ville Skyttä writes:
>
>  > PATCH 21.5
>  > 
>  > Cf. https://bugzilla.redhat.com/222559
>  > 
>  > "make install" installs canna_api.ell to MODPATH/canna_api.ell, but 
>  > canna-activate looks for it in MODPATH/canna/canna_api.ell.  This patch 
>  > changes canna-activate to use the installed location.
>
> I'm pretty sure that will break run-in-place, that's why the canna/
> prefix is there (I mostly run in-place).  This needs to be fixed
> either in the module search code or in the module's make all or make
> install targets.
>
> Jerry, Mike, what do you think?

I think Ville's patch is OK, but the load-path depth for modules needs
to be >0, as in the attached patch.

2007-01-27  Mike Sperber  <mike at xemacs.org>

	* setup-paths.el (paths-module-load-path-depth): Add.
	* setup-paths.el (paths-construct-module-load-path): For
	`module-load-path', use `paths-module-load-path-depth', not
	`paths-core-load-path-depth'.

Could somebody try this out and make sure it works?

I guess there's a whole bunch of instances where locating a module
specifies an explicit prefix, which it shouldn't.  Maybe Jerry can
shed some light on how things are supposed to hang together?

-- 
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
-------------- next part --------------
Index: lisp/setup-paths.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/setup-paths.el,v
retrieving revision 1.22
diff -u -r1.22 setup-paths.el
--- lisp/setup-paths.el	14 Mar 2006 00:09:03 -0000	1.22
+++ lisp/setup-paths.el	27 Jan 2007 14:50:05 -0000
@@ -55,6 +55,9 @@
 (defvar paths-mule-load-path-depth 0
   "Depth of load-path searches in Mule Lisp paths.")
 
+(defvar paths-module-load-path-depth 1
+  "Depth of load-path searches in module paths.")
+
 (defvar paths-default-info-directories
   (mapcar (function
 	   (lambda (dirlist)
@@ -243,7 +246,7 @@
 	 (module-load-path
 	  (and module-directory
 	       (paths-find-recursive-load-path (list module-directory)
-					       paths-core-load-path-depth))))
+					       paths-module-load-path-depth))))
     (append env-module-path
 	    site-module-load-path
 	    module-load-path)))