diff options
| author | Michi Henning <michi@zeroc.com> | 2007-08-06 16:41:27 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-08-06 16:41:27 +1000 |
| commit | 2ee98fb5b551b0d6a522a0f4c808a1fdac1473b5 (patch) | |
| tree | 9d444c8c2eb22ff0d6c0beeaa45e80f5cd6e4108 /cpp/makebindist.py | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| parent | fixing message (diff) | |
| download | ice-2ee98fb5b551b0d6a522a0f4c808a1fdac1473b5.tar.bz2 ice-2ee98fb5b551b0d6a522a0f4c808a1fdac1473b5.tar.xz ice-2ee98fb5b551b0d6a522a0f4c808a1fdac1473b5.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/makebindist.py')
| -rwxr-xr-x | cpp/makebindist.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/makebindist.py b/cpp/makebindist.py index a205eb4f9e4..bbd9a4fa817 100755 --- a/cpp/makebindist.py +++ b/cpp/makebindist.py @@ -356,14 +356,14 @@ endif ifeq ($(ICE_HOME),) ICE_DIR = /usr ifneq ($(shell test -f $(ICE_DIR)/bin/icestormadmin && echo 0),0) - NEXTDIR = /opt/Ice-$(VERSION) + NEXTDIR = /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR) 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) + NEXTDIR = /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)) 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 |