From 85bd76270956cc5a99a1d7ce95e9c2d94fbcdbfe Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 8 Mar 2010 19:22:14 +0000 Subject: [PATCH] Fix incorrect PC-BSD checks --- makepanda/makepanda.py | 2 +- makepanda/makepandacore.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index b811ba3773..432cff1a30 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -443,7 +443,7 @@ if (COMPILER=="LINUX"): IncDirectory("FREETYPE", "/usr/X11/include/freetype2") IncDirectory("OPENGL", "/usr/X11R6/include") - if (platform.uname()[1]=="pcbsd"): + if (os.path.exists("/usr/PCBSD")): IncDirectory("ALWAYS", "/usr/PCBSD/local/include") LibDirectory("ALWAYS", "/usr/PCBSD/local/lib") diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 5f56f37eb3..48b6d389fd 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -1178,7 +1178,7 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None, incdir = sorted(glob.glob("/usr/include/" + i))[-1] elif (len(glob.glob("/usr/local/include/" + i)) > 0): incdir = sorted(glob.glob("/usr/local/include/" + i))[-1] - elif (platform.uname()[1]=="pcbsd" and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0): + elif (os.path.isdir("/usr/PCBSD") and len(glob.glob("/usr/PCBSD/local/include/" + i)) > 0): incdir = sorted(glob.glob("/usr/PCBSD/local/include/" + i))[-1] else: have_pkg = False @@ -1629,7 +1629,7 @@ def CheckLinkerLibraryPath(): os.environ["DYLD_LIBRARY_PATH"] = builtlib # Workaround around compile issue on PCBSD - if (platform.uname()[1]=="pcbsd"): + if (os.path.exists("/usr/PCBSD")): os.environ["LD_LIBRARY_PATH"] += ":/usr/PCBSD/local/lib" ########################################################################