diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-08-24 11:28:20 -0400 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-08-24 11:28:20 -0400 |
| commit | 9a07052d6711858507faa27ff736d4520b3163e9 (patch) | |
| tree | 7fa0a0406be0386a8314b2e8c742f29bf127b70d /cpp/makebindist.py | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-9a07052d6711858507faa27ff736d4520b3163e9.tar.bz2 ice-9a07052d6711858507faa27ff736d4520b3163e9.tar.xz ice-9a07052d6711858507faa27ff736d4520b3163e9.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/makebindist.py')
| -rwxr-xr-x | cpp/makebindist.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py index a205eb4f9e4..e76f54741d8 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -700,14 +700,19 @@ def makeInstall(sources, buildDir, installDir, distro, clean, version, mmVersion logging.info('PYTHON_HOME is not set, figuring it out and trying that') pyHome = sys.exec_prefix os.environ['PYTHON_HOME'] = pyHome - + + if getPlatform() == 'macosx': + make = "make" + else: + make = "gmake" + # # XXX- Optimizations need to be turned on for the release. # try: - runprog('gmake NOGAC=yes OPTIMIZE=yes prefix=%s embedded_runpath_prefix=/opt/Ice-%s install' % (installDir, mmVersion)) + runprog(make + ' NOGAC=yes OPTIMIZE=yes prefix=%s embedded_runpath_prefix=/opt/Ice-%s install' % (installDir, mmVersion)) except ExtProgramError: - print "gmake failed for makeInstall(%s, %s, %s, %s, %s, %s, %s)" % (sources, buildDir, installDir, distro, str(clean), version, mmVersion) + print make + " failed for makeInstall(%s, %s, %s, %s, %s, %s, %s)" % (sources, buildDir, installDir, distro, str(clean), version, mmVersion) raise runprog('rm -rf /opt/Ice-%s' % (mmVersion), False) |