summaryrefslogtreecommitdiff
path: root/cpp/makebindist.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2007-02-07 15:26:01 +0000
committerBernard Normier <bernard@zeroc.com>2007-02-07 15:26:01 +0000
commitd09b6f7d061f0cffb6764885a6dfbf1d9b519b91 (patch)
tree87814fc977cbfaf7a53e747335b8ee2735c03824 /cpp/makebindist.py
parentfixed ice versioning (diff)
downloadice-d09b6f7d061f0cffb6764885a6dfbf1d9b519b91.tar.bz2
ice-d09b6f7d061f0cffb6764885a6dfbf1d9b519b91.tar.xz
ice-d09b6f7d061f0cffb6764885a6dfbf1d9b519b91.zip
Fixed version in demos.tar.gz
Diffstat (limited to 'cpp/makebindist.py')
-rwxr-xr-xcpp/makebindist.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py
index e0fd0c487c4..689c0afcc8e 100755
--- a/cpp/makebindist.py
+++ b/cpp/makebindist.py
@@ -313,14 +313,14 @@ endif
ifeq ($(ICE_HOME),)
ICE_DIR = /usr
ifneq ($(shell test -f $(ICE_DIR)/bin/icestormadmin && echo 0),0)
- NEXTDIR = /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+ NEXTDIR = /opt/Ice-$(VERSION)
ifneq ($(shell test -f $(NEXTDIR)/bin/icestormadmin && echo 0),0)
$(error Unable to locate Ice distribution, please set ICE_HOME!)
else
ICE_DIR = $(NEXTDIR)
endif
else
- NEXTDIR = /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
+ NEXTDIR = /opt/Ice-$(VERSION)
ifeq ($(shell test -f $(NEXTDIR)/bin/icestormadmin && echo 0),0)
$(warning Ice distribution found in /usr and $(NEXTDIR)! Installation in "/usr" will be used by default. Use ICE_HOME to specify alternate Ice installation.)
endif