diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-03-19 16:17:38 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-19 16:17:38 +0800 |
| commit | 73d5a8a0d49f6d038f187e5026832a56e42dc4e9 (patch) | |
| tree | 0c939ec0c5c5e68e0965c237935764f92d5579d1 /cpp | |
| parent | - Fixed [http://bugzilla/bugzilla/show_bug.cgi?id=2832 bug 2832] (diff) | |
| download | ice-73d5a8a0d49f6d038f187e5026832a56e42dc4e9.tar.bz2 ice-73d5a8a0d49f6d038f187e5026832a56e42dc4e9.tar.xz ice-73d5a8a0d49f6d038f187e5026832a56e42dc4e9.zip | |
fix Darwin Makefile.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.Darwin | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin index a0a05e816a7..c789f45308f 100644 --- a/cpp/config/Make.rules.Darwin +++ b/cpp/config/Make.rules.Darwin @@ -64,12 +64,14 @@ ifeq ($(DB_HOME),) dblib_install_name=$(firstword $(strip $(shell otool -L $(libdir)/libFreeze.$(VERSION).dylib | grep libdb_cxx))) ifeq ($(shell test ! -f $(dblib_install_name) -a -f $(libdir)/$(notdir $(dblib_install_name)) && echo 0),0) DB_RPATH_LINK=-dylib_file $(dblib_install_name):$(libdir)/$(notdir $(dblib_install_name)) - endif - endif + endif + endif ifeq ($(shell test -f $(ice_dir)/$(libsubdir)/libFreeze.$(VERSION).dylib && echo 0),0) dblib_install_name=$(firstword $(strip $(shell otool -L $(ice_dir)/$(libsubdir)/libFreeze.$(VERSION).dylib | grep libdb_cxx))) ifeq ($(shell test ! -f $(dblib_install_name) -a -f $(ice_dir)/$(libsubdir)/$(notdir $(dblib_install_name)) && echo 0),0) DB_RPATH_LINK=-dylib_file $(dblib_install_name):$(ice_dir)/$(libsubdir)/$(notdir $(dblib_install_name)) + endif + endif else endif endif @@ -89,4 +91,4 @@ ifdef ice_src_dist export DYLD_LIBRARY_PATH := $(libdir):$(DYLD_LIBRARY_PATH) else export DYLD_LIBRARY_PATH := $(ice_dir)/$(libsubdir):$(DYLD_LIBRARY_PATH) -endi +endif |