branch master updated: * tp/Texinfo/XSLoader.pm (init): add directory with .libs only if calling from build directory.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 919553078b * tp/Texinfo/XSLoader.pm (init): add directory with .libs 
only if calling from build directory.
919553078b is described below

commit 919553078b20c0de5f9bfda4339ef35acc387e1f
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Nov 22 11:00:40 2024 +0100

    * tp/Texinfo/XSLoader.pm (init): add directory with .libs only if
    calling from build directory.
---
 ChangeLog              | 5 +++++
 tp/Texinfo/XSLoader.pm | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 007e001164..a4417251ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-11-22  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/XSLoader.pm (init): add directory with .libs only if
+       calling from build directory.
+
 2024-11-22  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/ConvertXS.pm (BEGIN), tp/Texinfo/IndicesXS.pm
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index d829058c4b..9726daf953 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -132,7 +132,9 @@ sub load_libtool_library {
   # way we avoid accidentally loading the wrong library, e.g. if someone
   # has some random /usr/lib/libtexinfo.so file.
   # The *.so file is under .libs in the source directory.
-  unshift @DynaLoader::dl_library_path, "$libtool_dir/.libs";
+  if ($Texinfo::ModulePath::texinfo_uninstalled) {
+    unshift @DynaLoader::dl_library_path, "$libtool_dir/.libs";
+  }
   unshift @DynaLoader::dl_library_path, $libtool_dir;
 
   my @found_files = DynaLoader::dl_findfile($dlname);