X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=Makefile.local;h=ade84121fcb887e6c017bc977f063c17c52c0a8f;hb=8369ed31d0d687c35dc2464b347dadf16962cd27;hp=59b8d64ef4a3bf85797e6f517dcb29cbd0de640e;hpb=1d528f890ad34d0de596b09024f35216947de063;p=notmuch

diff --git a/Makefile.local b/Makefile.local
index 59b8d64e..ade84121 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -37,6 +37,11 @@ ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
 FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
 FINAL_NOTMUCH_LINKER = CXX
 endif
+ifeq ($(PLATFORM),LINUX)
+ifeq ($(LIBDIR_IN_LDCONFIG),0)
+FINAL_NOTMUCH_LDFLAGS += -Wl,--enable-new-dtags -Wl,-rpath,$(libdir)
+endif
+endif
 FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
 .PHONY: all
@@ -56,10 +61,6 @@ ifeq ($(shell cat .first-build-message 2>/dev/null),)
 endif
 endif
 
-.PHONY: test
-test: all
-	@./test/notmuch-test
-
 $(TAR_FILE):
 	git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp
 	echo $(VERSION) > version.tmp