X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2FMakefile.local;h=5233ea6abe908a34647a4a0613c72395fc4a8fa7;hp=9c0facce2b54ddce48fa619f8e983f2e27124da6;hb=d33dee5389e5d4a88c8504b1c94d2c9cb432fe52;hpb=d64d0cc8d9f9e9f23fa4432328db2ea4739bae0f

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 9c0facce..5233ea6a 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -14,8 +14,10 @@
 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
+# the time of release for any additions to the library interface,
+# (and when it is incremented, the release version of the library should
+#  be reset to 0).
+LIBNOTMUCH_VERSION_MINOR = 3
 
 # 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
@@ -36,15 +38,18 @@ 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
 extra_cflags += -I$(dir) -fPIC
 
 libnotmuch_c_srcs =		\
 	$(notmuch_compat_srcs)	\
+	$(dir)/filenames.c	\
 	$(dir)/libsha1.c	\
 	$(dir)/message-file.c	\
 	$(dir)/messages.c	\
@@ -76,13 +81,17 @@ $(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)