diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-08-01 12:47:50 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-08-01 12:47:50 -0230 |
| commit | f86b780ae0d112964ea7a7c254bc8078b12b2999 (patch) | |
| tree | a19b5d3cf50e291229ed9cc732392e75070bde12 /cpp/makebindist.py | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2342 - warn about invalid ... (diff) | |
| download | ice-f86b780ae0d112964ea7a7c254bc8078b12b2999.tar.bz2 ice-f86b780ae0d112964ea7a7c254bc8078b12b2999.tar.xz ice-f86b780ae0d112964ea7a7c254bc8078b12b2999.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2332
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 |