summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2007-03-07 01:53:55 +0000
committerMatthew Newhook <matthew@zeroc.com>2007-03-07 01:53:55 +0000
commit513fd6154c4eef79cd58c94fcf8d2e25efb6977e (patch)
tree4f324145633d00844d3187ebc84463a88e5ab927 /cpp/src
parenthttp://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1984 (diff)
downloadice-513fd6154c4eef79cd58c94fcf8d2e25efb6977e.tar.bz2
ice-513fd6154c4eef79cd58c94fcf8d2e25efb6977e.tar.xz
ice-513fd6154c4eef79cd58c94fcf8d2e25efb6977e.zip
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1979
Diffstat (limited to 'cpp/src')
-rwxr-xr-xcpp/src/ca/iceca6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/ca/iceca b/cpp/src/ca/iceca
index 9f882e822ad..fb843cba17b 100755
--- a/cpp/src/ca/iceca
+++ b/cpp/src/ca/iceca
@@ -74,8 +74,10 @@ if sys.argv[script] == "import":
# development. "/usr/bin" handles RPM installs and "/opt/..."
# handles standard tarball installs.
#
- for bindir in [os.path.dirname(sys.argv[0]), os.path.join(os.getenv("ICE_HOME"), "bin"), ".", "/usr/bin", \
- "/opt/Ice-3.2.0/bin"]:
+ checkLocations = [os.path.dirname(sys.argv[0]), ".", "/usr/bin", "/opt/Ice-3.2.0/bin"]
+ if os.getenv("ICE_HOME"):
+ checkLocations.append(os.path.join(os.getenv("ICE_HOME"), "bin"))
+ for bindir in checkLocations:
bindir = os.path.normpath(bindir)
if os.path.exists(os.path.join(bindir, "ImportKey.class")):
break