Fix install_name of plugins

Closes: https://trac.macports.org/ticket/37867
macports · Jun 2, 2018 · 4d4eb1c · 4d4eb1c
1 parent 0e09a22
commit 4d4eb1c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/darwintracelib1.0/Makefile.in b/src/darwintracelib1.0/Makefile.in
@@ -41,6 +41,9 @@ INSTALLDIR = $(TCL_PACKAGE_PATH)/darwintrace1.0
 CFLAGS_PEDANTIC =
 CFLAGS += -fPIC $(UNIVERSAL_ARCHFLAGS)
 SHLIB_LDFLAGS += $(UNIVERSAL_ARCHFLAGS)
+ifeq ($(shell uname),Darwin)
+SHLIB_LDFLAGS += -install_name $(INSTALLDIR)/$(SHLIB_NAME)
+endif
 
 # Generate dependency information
 %.d : %.c

diff --git a/src/machista1.0/Makefile.in b/src/machista1.0/Makefile.in
@@ -20,6 +20,9 @@ TESTS = ./tests/libmachista-test
 include $(srcdir)/../../Mk/macports.tea.mk
 
 CFLAGS+= -fPIC
+ifeq ($(shell uname),Darwin)
+SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME}
+endif
 
 ${SWIG_SRCS}:: ${SWIG_IFACE}
 ifdef SWIG

diff --git a/src/macports1.0/Makefile.in b/src/macports1.0/Makefile.in
@@ -19,6 +19,10 @@ endif
 
 pkgIndex.tcl: $(SRCS)
 
+ifeq ($(shell uname),Darwin)
+SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME}
+endif
+
 test::
 	$(TCLSH) $(srcdir)/../tests/test.tcl -nocolor
 

diff --git a/src/pextlib1.0/Makefile.in b/src/pextlib1.0/Makefile.in
@@ -55,7 +55,7 @@ CFLAGS+= ${CURL_CFLAGS} ${MD5_CFLAGS} ${READLINE_CFLAGS}
 LIBS+= ${CURL_LIBS} ${MD5_LIBS} ${READLINE_LIBS}
 ifeq ($(shell uname),Darwin)
 LIBS+= ../registry2.0/registry${SHLIB_SUFFIX}
-SHLIB_LDFLAGS+= -install_name ${TCL_PACKAGE_PATH}/pextlib1.0/${SHLIB_NAME}
+SHLIB_LDFLAGS+= -install_name ${INSTALLDIR}/${SHLIB_NAME}
 ${SHLIB_NAME}: ../registry2.0/registry${SHLIB_SUFFIX}
 endif