From b6d88741c3ae00058b407740dfea1d10b77bff46 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 10 Nov 2010 19:49:42 +0000 Subject: [PATCH] Properer fix --- makepanda/makepanda.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index ab5bcde601..f4429c9f86 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -174,7 +174,6 @@ def parseopts(args): usage("Options --runtime and --rtdist cannot be specified at the same time!") if (optimize=="" and (RTDIST or RUNTIME)): optimize = "4" elif (optimize==""): optimize = "3" - if (DEBVERSION is None): DEBVERSION = VERSION if (OSXTARGET != None and OSXTARGET.strip() == ""): OSXTARGET = None elif (OSXTARGET != None): @@ -218,16 +217,19 @@ if (sys.platform == "darwin" and OSXTARGET != None): ## ######################################################################## -if (VERSION == None): +if (VERSION is None): if (RUNTIME): VERSION = ParsePluginVersion("dtool/PandaVersion.pp") COREAPI_VERSION = VERSION + "." + ParseCoreapiVersion("dtool/PandaVersion.pp") else: VERSION = ParsePandaVersion("dtool/PandaVersion.pp") -if (COREAPI_VERSION == None): +if (COREAPI_VERSION is None): COREAPI_VERSION = VERSION +if (DEBVERSION is None): + DEBVERSION = VERSION + MAJOR_VERSION = VERSION[:3] if (RUNTIME or RTDIST):