diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-08-08 11:46:22 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-08-08 11:46:22 -0230 |
| commit | 8fe7e7047c5ff4e9fbc0048af7c6061610c1e352 (patch) | |
| tree | 4c70f00ead8f4814dc2089b28b1f5ecbc4355c75 /cpp/makebindist.py | |
| parent | Fixed bugs #2381 and #2382 (diff) | |
| download | ice-8fe7e7047c5ff4e9fbc0048af7c6061610c1e352.tar.bz2 ice-8fe7e7047c5ff4e9fbc0048af7c6061610c1e352.tar.xz ice-8fe7e7047c5ff4e9fbc0048af7c6061610c1e352.zip | |
Revert back to /opt/Ice-X.Y.Z as default Ice location
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 3c633e5b087..a205eb4f9e4 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_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 |