diff options
Diffstat (limited to 'cpp/newmakebindist.py')
| -rwxr-xr-x | cpp/newmakebindist.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/cpp/newmakebindist.py b/cpp/newmakebindist.py index 6a22e6c45ab..fab49f56d96 100755 --- a/cpp/newmakebindist.py +++ b/cpp/newmakebindist.py @@ -468,7 +468,7 @@ def extractDemos(buildDir, version, distro, demoDir): # The RPM configuration is the only one that cares about Ice # version numbers. # - os.system("perl -pi -e 's/ICE_VERSION/" + version + "/' common.rpm.xml") + os.system("perl -pi -e 's/ICE_VERSION/" + version + "/' common.xml") os.chdir(tcwd) shutil.rmtree(buildDir + "/demotree/" + distro, True) @@ -568,6 +568,15 @@ 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": + 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") + os.system("gmake OPTIMIZE=yes RPM_BUILD_ROOT=" + installDir + " install") os.chdir(cwd) |