--- unix/Makefile.in.orig	2015-06-18 13:37:38.000000000 -0500
+++ unix/Makefile.in	2015-06-20 07:30:10.000000000 -0500
@@ -38,6 +38,7 @@
 
 CXX_FLAGS = @CPPFLAGS@ @CXXFLAGS@ @MK_THREADS@ @SHLIB_CFLAGS@ \
 		-I$(srcdir)/../include
+LD_FLAGS = @LDFLAGS@
 
 # Compiling without frame pointers can play tricks with exception handling
 # (e.g. in Mk4py).  This does not affect standard operation, *only* errors.
@@ -46,6 +47,7 @@
 CXXFLAGS = $(CXX_FLAGS)
 #CXXFLAGS = -Dq4_CHECK $(CXX_FLAGS)
 #CXXFLAGS = -Wall -pedantic -Wno-unused $(CXX_FLAGS)
+LDFLAGS = $(LD_FLAGS)
 
 CXX = @CXX@
 INSTALL = @INSTALL@
@@ -80,7 +82,7 @@
 	test -d tests || mkdir tests
 	-test -d ../tests/ok/CVS && (test -d tests/CVS || mkdir tests/CVS)
 	test -f reversed || cp $(srcdir)/reversed .
-	./regress
+	DYLD_LIBRARY_PATH=$(top_builddir) ./regress
 	diff --exclude=.svn $(srcdir)/../tests/ok tests
 
 test-tcl: tcl
@@ -135,7 +137,7 @@
 	$(RANLIB) $@
 
 libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS)
+	$(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS) -install_name $(libdir)/$@
 
 Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
 	$(AR) rcu $@ mk4tcl.o mk4too.o $(LOBJS)
@@ -143,14 +145,14 @@
 
 Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
 	$(SHLIB_LD) -o $@ mk4tcl.o mk4too.o \
-			$(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS)
+			$(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS) -install_name $(tcllibdir)/Mk4tcl/$@
 
 Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
 	$(AR) cru $@ $(PYOBJS) $(LOBJS)
 	$(RANLIB) $@
 
 Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS)
+	$(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS) $(LDFLAGS) -install_name $(pylibdir)/$@
 
 demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT)
 	$(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \