1 diff --git a/Makefile b/Makefile
2 index cc84386..b526442 100644
5 @@ -1143,9 +1143,7 @@ ifeq ($(target),Linux)
6 BLD_TYPE= calc-dynamic-only
9 -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
10 -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
11 - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
13 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
15 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
16 @@ -1177,9 +1175,8 @@ ifeq ($(target),Darwin)
17 BLD_TYPE= calc-dynamic-only
20 -DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
21 LD_SHARE= ${DARWIN_ARCH}
22 -LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
23 +LIBCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib -install_name ${LIBDIR}/libcalc${LIB_EXT_VERSION}
25 LIBCUSTCALC_SHLIB= -single_module -undefined dynamic_lookup -dynamiclib
27 @@ -1196,7 +1193,7 @@ CCWERR=
29 CCMISC= ${DARWIN_ARCH}
31 -LCC= MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} gcc
33 CC= ${PURIFY} ${LCC} ${CCWERR}
35 # Darmin dynamic shared lib filenames
36 @@ -1211,7 +1208,6 @@ LDCONFIG:=
37 # DARWIN_ARCH= -arch i386 # Intel binary
38 # DARWIN_ARCH= -arch ppc # PPC binary
39 DARWIN_ARCH= # native binary
40 -MACOSX_DEPLOYMENT_TARGET=10.8
44 @@ -1230,9 +1226,7 @@ ifeq ($(target),FreeBSD)
45 BLD_TYPE= calc-dynamic-only
48 -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
49 -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
50 - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
52 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
54 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
55 @@ -1272,9 +1266,7 @@ ifeq ($(target),OpenBSD)
56 BLD_TYPE= calc-dynamic-only
59 -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
60 -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
61 - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
63 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
65 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
66 @@ -1347,9 +1339,7 @@ ifeq ($(target),simple)
67 BLD_TYPE= calc-static-only
70 -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
71 -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
72 - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
74 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
75 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
77 @@ -1403,9 +1393,7 @@ CALCRC= ${CALC_SHAREDIR}/startup;~/.calcrc;./.calcinit
78 BLD_TYPE= calc-static-only
81 -DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
82 -LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
83 - "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
85 LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
87 LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"