diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/Makefile | 2 | ||||
| -rw-r--r-- | cpp/config/Make.rules | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 060fadb7e7f..1839141d02f 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -16,7 +16,7 @@ SUBDIRS = config src include test demo doc INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_docdir) install:: install-common -ifneq ($(embedded_runpath_prefix),) +ifeq ("$(create_runpath_symlink)",yes) @if test -h $(embedded_runpath_prefix) ; \ then \ if `\rm -f $(embedded_runpath_prefix) 2>/dev/null`; \ diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 35947f4f3f6..ed6f03c25ac 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -95,12 +95,6 @@ USE_READLINE ?= no #MCPP_HOME ?= /opt/mcpp # -# Define if your OpenSSL requires Kerberos, and if Kerberos is not -# installed in a standard location -# -KERBEROS_HOME ?= /usr/kerberos - -# # If readline is not installed in a standard location where the # compiler can find it, AND you want to use readline, set # READLINE_HOME to the readline installation directory. @@ -160,7 +154,8 @@ else endif ifneq ($(embedded_runpath_prefix),) - runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) + runpath_libdir := $(embedded_runpath_prefix)/$(libsubdir) + create_runpath_symlink ?= yes endif ifneq ($(STLPORT_HOME),) @@ -188,9 +183,9 @@ ifneq ($(DB_HOME),) DB_LIBS = -L$(DB_HOME)/$(libsubdir) -ldb_cxx DB_RPATH_LINK = $(call rpathlink,$(DB_HOME)/$(libsubdir)) else - ifeq ($(shell if [ -d /usr/include/db45 -a -d /usr/$(libsubdir)/db45 ] ; then echo yes; fi), yes) - DB_FLAGS = -I/usr/include/db45 - DB_LIBS = -L/usr/$(libsubdir)/db45 -ldb_cxx + ifeq ($(shell if [ -d /usr/include/db46 -a -d /usr/$(libsubdir)/db46 ] ; then echo yes; fi), yes) + DB_FLAGS = -I/usr/include/db46 + DB_LIBS = -L/usr/$(libsubdir)/db46 -ldb_cxx else DB_LIBS = -ldb_cxx endif |