summaryrefslogtreecommitdiff
path: root/cpp/makebindist.py
diff options
context:
space:
mode:
authorBrent Eagles <brent@zeroc.com>2005-11-16 04:36:48 +0000
committerBrent Eagles <brent@zeroc.com>2005-11-16 04:36:48 +0000
commitf240566c58cebd53bebb7f7691902c8326bedeca (patch)
tree43f4cf1a437615ef4e0bc72fd7f498603c864a0a /cpp/makebindist.py
parentWorking towards proper support for 64 bit Linux rpms (diff)
downloadice-f240566c58cebd53bebb7f7691902c8326bedeca.tar.bz2
ice-f240566c58cebd53bebb7f7691902c8326bedeca.tar.xz
ice-f240566c58cebd53bebb7f7691902c8326bedeca.zip
64 bit specific fixes
Diffstat (limited to 'cpp/makebindist.py')
-rwxr-xr-xcpp/makebindist.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py
index 92ff8bf08f2..b0c952cdd5e 100755
--- a/cpp/makebindist.py
+++ b/cpp/makebindist.py
@@ -378,8 +378,14 @@ def makeInstall(sources, buildDir, installDir, distro, clean, version):
# with the Jar already built.
#
if distro.startswith('IceJ'):
- shutil.copy(buildDir + '/' + distro + '/lib/Ice.jar', installDir + '/lib')
- shutil.copy(buildDir + '/' + distro + '/lib/IceGridGUI.jar', installDir + '/lib')
+ if getPlatform() == 'linux64':
+ shutil.copy(buildDir + '/' + distro + '/lib/Ice.jar',
+ installDir + '/lib64')
+ shutil.copy(buildDir + '/' + distro + '/lib/IceGridGUI.jar',
+ installDir + '/lib64')
+ else:
+ shutil.copy(buildDir + '/' + distro + '/lib/Ice.jar', installDir + '/lib')
+ shutil.copy(buildDir + '/' + distro + '/lib/IceGridGUI.jar', installDir + '/lib')
#
# We really just want to copy the files, not move them.
# Shelling out to a copy is easier (and more likely to always