X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=Makefile.local;h=bc61a3c108f0db972987a6e5aa0ab6dc0262f1a6;hb=7a72999fad235deddb1364b8667f7012939ab385;hp=854cf5200393707ca4ab8cc8dbf81d69bfec95eb;hpb=80240877f836214e556f1ff75a058465a69f2dea;p=notmuch diff --git a/Makefile.local b/Makefile.local index 854cf520..bc61a3c1 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 @@ -89,11 +94,17 @@ dist: $(TAR_FILE) release: verify-source-tree-and-version $(MAKE) VERSION=$(VERSION) verify-newer $(MAKE) VERSION=$(VERSION) test + rm -rf ./debian-build + git-buildpackage + cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz $(MAKE) VERSION=$(VERSION) $(GPG_FILE) scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR) ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)" mkdir -p releases mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases + (cd debian-build; dput *.changes) + mv debian-build/* releases + rmdir debian-build git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION) git push origin $(VERSION) $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce @@ -267,11 +278,20 @@ ifeq ($(MAKECMDGOALS), install) @echo "" @echo "Notmuch is now installed to $(DESTDIR)$(prefix)" @echo "" - @echo "To run notmuch from emacs, each user should add the following line to ~/.emacs:" + @echo "New users should simply run \"notmuch\" to be guided" + @echo "through the process of configuring notmuch and creating" + @echo "a database of existing email messages. The \"notmuch\"" + @echo "command will also offer some sample search commands." + @echo "" + @echo "Beyond the command-line interface, notmuch also offers" + @echo "a full-featured interface for reading and writing mail" + @echo "within emacs. To use this, each user should add the" + @echo "following line to the ~/.emacs file:" @echo "" @echo " (require 'notmuch)" @echo "" - @echo "And should then run \"M-x notmuch\" from within emacs or run \"emacs -f notmuch\"" + @echo "And then run emacs as \"emacs -f notmuch\" or invoke" + @echo "the command \"M-x notmuch\" from within emacs." endif .PHONY: install-desktop