diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-07-24 10:53:26 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-07-24 10:53:26 -0230 |
| commit | 8f70d3502d8395c6ba774c53f10ce184e26ad48c (patch) | |
| tree | 11f1b528bb7d7973a2b1f8e2f9fec645169e8ed7 /cpp | |
| parent | Fixed bug 2308, 2309, 2310 (diff) | |
| download | ice-8f70d3502d8395c6ba774c53f10ce184e26ad48c.tar.bz2 ice-8f70d3502d8395c6ba774c53f10ce184e26ad48c.tar.xz ice-8f70d3502d8395c6ba774c53f10ce184e26ad48c.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=2312 - changed 64 bit bin install directory
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules | 4 | ||||
| -rw-r--r-- | cpp/config/Make.rules.HP-UX | 1 | ||||
| -rw-r--r-- | cpp/config/Make.rules.SunOS | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index ff4f49369ee..b855cde8dab 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -122,8 +122,6 @@ libdir = $(top_srcdir)/lib includedir = $(top_srcdir)/include slicedir = $(top_srcdir)/slice -install_bindir = $(prefix)/bin - install_includedir = $(prefix)/include install_slicedir = $(prefix)/slice install_schemadir = $(prefix)/schema @@ -144,9 +142,11 @@ UNAME := $(shell uname) include $(top_srcdir)/config/Make.rules.$(UNAME) ifeq ($(LP64),yes) + install_bindir := $(prefix)/bin$(lp64binsuffix) install_libdir := $(prefix)/lib$(lp64suffix) libsubdir := lib$(lp64suffix) else + install_bindir := $(prefix)/bin install_libdir := $(prefix)/lib libsubdir := lib endif diff --git a/cpp/config/Make.rules.HP-UX b/cpp/config/Make.rules.HP-UX index 088e8485737..903d2a4a480 100644 --- a/cpp/config/Make.rules.HP-UX +++ b/cpp/config/Make.rules.HP-UX @@ -76,6 +76,7 @@ ICEUTIL_OS_LIBS = -lpthread -lrt ICE_OS_LIBS = lp64suffix = /pa20_64 +lp64binsuffix = /pa20_64 ifeq ($(LP64),yes) export LD_LIBRARY_PATH := $(libdir):$(LD_LIBRARY_PATH) diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index 8fb40abe276..f3348cb04ec 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -155,9 +155,11 @@ ICE_OS_LIBS = -ldl -lsocket ifeq ($(MACHINE_TYPE),sun4u) lp64suffix = /sparcv9 + lp64binsuffix = /sparcv9 endif ifeq ($(MACHINE_TYPE),i86pc) lp64suffix = /amd64 + lp64binsuffix = /amd64 endif ifeq ($(LP64),yes) |