0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scons: fallback to env["prefix"] if no gtkdir set

Browse source
This commit is contained in:
loonycyborg 2023-03-31 22:37:13 +03:00
parent bfec7369f3
commit d78068efa8
No known key found for this signature in database
GPG key ID: 6E8233FAB8F26D61
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scons/cairo.py
View file

@ -7,7 +7,7 @@ def CheckCairo(context, min_version):
context.Message("Checking for Cairo... ")
env = context.env
gtkdir = env.get("gtkdir", environ.get("GTK_BASEPATH"))
gtkdir = env.get("gtkdir") or environ.get("GTK_BASEPATH") or env.get("prefix")
if gtkdir:
environ["PATH"] = AppendPath(environ["PATH"], join(gtkdir, "bin"))
environ["PKG_CONFIG_PATH"] = AppendPath(environ.get("PKG_CONFIG_PATH", ""), join(gtkdir, "lib/pkgconfig"))

2
scons/pango.py
View file

@ -7,7 +7,7 @@ from SCons.Util import AppendPath
def CheckPango(context, backend, require_version = None):
context.Message("Checking for Pango with " + backend + " backend... ")
env = context.env
gtkdir = env.get("gtkdir", os.environ.get("GTK_BASEPATH"))
gtkdir = env.get("gtkdir") or os.environ.get("GTK_BASEPATH") or env.get("prefix")
if gtkdir:
environ["PATH"] = AppendPath(environ["PATH"], join(gtkdir, "bin"))
environ["PKG_CONFIG_PATH"] = AppendPath(environ.get("PKG_CONFIG_PATH", ""), join(gtkdir, "lib/pkgconfig"))