summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-13 14:35:39 (GMT)
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-13 14:35:39 (GMT)
commit94e8397004ef0d9c54ee5156466a3c5d9a975d12 (patch)
treeeadcf00a97c2783781733cfbddbb72d46c4d4992
parentc41a8aedc77afd30784c04c0fa115bc24047e305 (diff)
downloadpykolab-94e8397004ef0d9c54ee5156466a3c5d9a975d12.tar.gz
Take into account the library directory for multi-architecture compatibility (i.e. /usr/lib/ vs. /usr/lib64/)
-rwxr-xr-xext/python/Tools/freeze/freeze.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/python/Tools/freeze/freeze.py b/ext/python/Tools/freeze/freeze.py
index 836f532..ceab329 100755
--- a/ext/python/Tools/freeze/freeze.py
+++ b/ext/python/Tools/freeze/freeze.py
@@ -155,7 +155,7 @@ def main():
# Now parse the command line with the extras inserted.
try:
- opts, args = getopt.getopt(sys.argv[1:], 'r:a:dEe:hmo:p:P:qs:wX:x:l:')
+ opts, args = getopt.getopt(sys.argv[1:], 'r:a:dEe:hmo:p:P:b:qs:wX:x:l:')
except getopt.error, msg:
usage('getopt error: ' + str(msg))
@@ -164,6 +164,8 @@ def main():
if o == '-h':
print __doc__
return
+ if o == '-b':
+ binlib = a
if o == '-d':
debug = debug + 1
if o == '-e':
@@ -232,8 +234,12 @@ def main():
if win:
frozendllmain_c = os.path.join(exec_prefix, 'Pc\\frozen_dllmain.c')
else:
- binlib = os.path.join(exec_prefix,
+ if not binlib:
+ binlib = os.path.join(exec_prefix,
'lib', 'python%s' % version, 'config')
+ else:
+ binlib = os.path.join(binlib, 'python%s' % version, 'config')
+
incldir = os.path.join(prefix, 'include', 'python%s' % version)
config_h_dir = os.path.join(exec_prefix, 'include',
'python%s' % version)