Browse Source

Fix custom outputdir code

rdb 16 years ago
parent
commit
4a380d4208
2 changed files with 4 additions and 1 deletions
  1. 1 1
      makepanda/makepanda.py
  2. 3 0
      makepanda/makepandacore.py

+ 1 - 1
makepanda/makepanda.py

@@ -197,7 +197,7 @@ if (RUNTIME or RTDIST):
     if (DISTRIBUTOR.strip() == ""):
     if (DISTRIBUTOR.strip() == ""):
         exit("You must provide a valid distributor name when making a runtime or rtdist build!")
         exit("You must provide a valid distributor name when making a runtime or rtdist build!")
 
 
-    if (not CUSTOM_OUTPUTDIR):
+    if (not IsCustomOutputDir()):
         if (RTDIST):
         if (RTDIST):
             SetOutputDir("built_" + DISTRIBUTOR.strip())
             SetOutputDir("built_" + DISTRIBUTOR.strip())
         elif (RUNTIME):
         elif (RUNTIME):

+ 3 - 0
makepanda/makepandacore.py

@@ -790,6 +790,9 @@ def SetVC90CRTVersion(fn, ver = None):
 def GetOutputDir():
 def GetOutputDir():
   return OUTPUTDIR
   return OUTPUTDIR
 
 
+def IsCustomOutputDir():
+  return CUSTOM_OUTPUTDIR
+
 def SetOutputDir(outputdir):
 def SetOutputDir(outputdir):
   global OUTPUTDIR, CUSTOM_OUTPUTDIR
   global OUTPUTDIR, CUSTOM_OUTPUTDIR
   OUTPUTDIR=outputdir
   OUTPUTDIR=outputdir