From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 2 Jan 2005 23:17:06 +0000 (+0000)
Subject: Added a band-aid to make this script work with the older 2.3.0
X-Git-Tag: v2.3.5c1~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04fa4b9ef03ffe507b2205d21c38712ef4bc4fc2;p=thirdparty%2FPython%2Fcpython.git

Added a band-aid to make this script work with the older 2.3.0
buildtools if no destroot option is given. That makes life for the
additions installer a lot simpler.
---

diff --git a/Mac/scripts/BuildApplet.py b/Mac/scripts/BuildApplet.py
index a3bf73ab51b3..f9d94a124ec0 100644
--- a/Mac/scripts/BuildApplet.py
+++ b/Mac/scripts/BuildApplet.py
@@ -99,9 +99,14 @@ def buildapplet():
 			if tp == 'APPL':
 				buildtools.update(template, filename, dstfilename)
 			else:
-				buildtools.process(template, filename, dstfilename, 1,
-						rsrcname=rsrcfilename, others=extras, raw=raw,
-						progress=verbose, destroot=destroot)
+				if destroot:
+					buildtools.process(template, filename, dstfilename, 1,
+							rsrcname=rsrcfilename, others=extras, raw=raw,
+							progress=verbose, destroot=destroot)
+				else:
+					buildtools.process(template, filename, dstfilename, 1,
+							rsrcname=rsrcfilename, others=extras, raw=raw,
+							progress=verbose)
 
 def usage():
 	print "BuildApplet creates an application from a Python source file"