[jhbuild] environment: Fix INFOPATH for *BSD ports and pkgsrc



commit 19a3a0f3174e60cdb5ecf22d62c9d6659c659066
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sat May 13 22:18:52 2017 +0800

    environment: Fix INFOPATH for *BSD ports and pkgsrc
    
    Ports and pkgsrc are widely used on *BSD systems to install third-party
    software, but these systems patch all software to install Texinfo pages
    in $prefix/info instead of $prefix/share/info. In order to set correct
    INFOPATH on prefixes managed by ports or pkgsrc, we check whether
    $prefix/info exists and use it if $prefix/share/info cannot be found.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782598

 jhbuild/environment.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/jhbuild/environment.py b/jhbuild/environment.py
index 029186e..a725ea4 100644
--- a/jhbuild/environment.py
+++ b/jhbuild/environment.py
@@ -178,7 +178,11 @@ def setup_env(prefix):
 
     # INFOPATH
     infopathdir = os.path.join(prefix, 'share', 'info')
-    addpath('INFOPATH', infopathdir)
+    infopathports = os.path.join(prefix, 'info')
+    if not os.path.exists(infopathdir) and os.path.exists(infopathports):
+        addpath('INFOPATH', infopathports)
+    else:
+        addpath('INFOPATH', infopathdir)
 
     # PKG_CONFIG_PATH
     pkgconfigdatadir = os.path.join(prefix, 'share', 'pkgconfig')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]