X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2FMakefile.local;h=3d7de5caffa6516332ded9f46203e354c67371cf;hp=62f23169c27aa2bfc5f28b0da83dc038b56332aa;hb=4dd066ae6cef50eeed805ab16c10a2190de606fb;hpb=a54cecfc8e8fb501d783806b1b603c7b283e00a1

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 62f23169..3d7de5ca 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -15,7 +15,7 @@ LIBNOTMUCH_VERSION_MAJOR = 1
 
 # The minor version of the library interface. This should be incremented at
 # the time of release for any additions to the library interface.
-LIBNOTMUCH_VERSION_MINOR = 1
+LIBNOTMUCH_VERSION_MINOR = 2
 
 # The release version the library interface. This should be incremented at
 # the time of release if there have been no changes to the interface, (but
@@ -35,6 +35,11 @@ LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
 SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)
 LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
 LIBRARY_LINK_FLAG = -shared -Wl,-soname=$(SONAME)
+ifeq ($(LIBDIR_IN_LDCONFIG),1)
+ifeq ($(DESTDIR),)
+LIBRARY_INSTALL_POST_COMMAND=ldconfig
+endif
+endif
 endif
 
 dir := lib
@@ -73,13 +78,18 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME)
 
 install: install-$(dir)
 
+# The (often-reused) $dir works fine within targets/pre-requisites,
+# but cannot be used reliably within commands, so copy its value to a
+# variable that is not reused.
+lib := $(dir)
 install-$(dir):
 	mkdir -p $(DESTDIR)$(libdir)/
-	install -m0644 $(dir)/$(LIBNAME) $(DESTDIR)$(libdir)/
+	install -m0644 $(lib)/$(LIBNAME) $(DESTDIR)$(libdir)/
 	ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME)
 	ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME)
 	mkdir -p $(DESTDIR)$(includedir)
-	install -m0644 $(dir)/notmuch.h $(DESTDIR)$(includedir)/
+	install -m0644 $(lib)/notmuch.h $(DESTDIR)$(includedir)/
+	$(LIBRARY_INSTALL_POST_COMMAND)
 
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)
 CLEAN := $(CLEAN) $(libnotmuch_modules) $(dir)/$(SONAME) $(dir)/$(LINKER_NAME) $(dir)$(LIBNAME) libnotmuch.a