test: Rework test-suite input to avoid ulti-command strings

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index a0920905cb3bd197020a2e0cb63c9f90d11db905..9c0facce2b54ddce48fa619f8e983f2e27124da6 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -15,14 +15,14 @@ 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 = 0
+LIBNOTMUCH_VERSION_MINOR = 1
 
 # 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
 # simply compatible changes to the implementation).
 LIBNOTMUCH_VERSION_RELEASE = 0
 
-ifeq ($(MAC_OS_X),1)
+ifeq ($(PLATFORM),MACOSX)
 LIBRARY_SUFFIX = dylib
 # On OS X, library version numbers go before suffix.
 LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
@@ -35,6 +35,9 @@ 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)
+LIBRARY_INSTALL_POST_COMMAND=ldconfig
+endif
 endif
 
 dir := lib
@@ -80,6 +83,7 @@ install-$(dir):
        ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME)
        mkdir -p $(DESTDIR)$(includedir)
        install -m0644 $(dir)/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