diff options
author | Brent Eagles <brent@zeroc.com> | 2005-02-21 15:32:09 +0000 |
---|---|---|
committer | Brent Eagles <brent@zeroc.com> | 2005-02-21 15:32:09 +0000 |
commit | f6843f1f48975248f7ba8e877dde075c421798ab (patch) | |
tree | fd248ca11dcf9967edd747b5e29631a01dc13d87 /cpp/newmakebindist.py | |
parent | fix ant incompatibilities with the fail task (diff) | |
download | ice-f6843f1f48975248f7ba8e877dde075c421798ab.tar.bz2 ice-f6843f1f48975248f7ba8e877dde075c421798ab.tar.xz ice-f6843f1f48975248f7ba8e877dde075c421798ab.zip |
python build tweaks
Diffstat (limited to 'cpp/newmakebindist.py')
-rwxr-xr-x | cpp/newmakebindist.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cpp/newmakebindist.py b/cpp/newmakebindist.py index 99870b7bf04..c8e846b9117 100755 --- a/cpp/newmakebindist.py +++ b/cpp/newmakebindist.py @@ -566,13 +566,22 @@ def makeInstall(buildDir, installDir, distro, clean): os.system("perl -pi -e 's/^PYTHON.HOME.*$/PYTHON\_HOME \?= "+ pyHome.replace("/", "\/") + \ "/' config/Make.rules") - if distro.startswith("Ice-"): - if getPlatform() <> "linux": + if getPlatform() <> "linux": + if distro.startswith("Ice-"): os.system("perl -pi -e 's/^#(BZIP2_HOME)/$1/' config/Make.rules") os.system("perl -pi -e 's/^#(DB_HOME)/$1/' config/Make.rules") os.system("perl -pi -e 's/^#(OPENSSL_HOME)/$1/' config/Make.rules") os.system("perl -pi -e 's/^#(EXPAT_HOME)/$1/' config/Make.rules") os.system("perl -pi -e 's/^#(READLINE_HOME)/$1/' config/Make.rules") + elif distro.startswith("IcePy"): + os.system("perl -pi -e 's/^PYTHON_INCLUDE_DIR.*$/PYTHON_INCLUDE_DIR = \$\(PYTHON_HOME\)\/include\/" + \ + "\$\(PYTHON_VERSION\)/' config/Make.rules") + if getPlatform() == "hpux": + os.system("perl -pi -e 's/^PYTHON_LIB_DIR.*$/PYTHON_LIB_DIR = \$\(PYTHON_HOME\)\/lib/" + \ + " config/Make.rules") + else: + os.system("perl -pi -e 's/^PYTHON_LIB_DIR.*$/PYTHON_LIB_DIR = \$\(PYTHON_HOME\)\/lib\/" + \ + "\$\(PYTHON_VERSION\)\/config/' config/Make.rules") os.system("gmake OPTIMIZE=yes RPM_BUILD_ROOT=" + installDir + " install") os.chdir(cwd) |