lib: Fix "make install"

This has been broken since the addition of the test sub-directory to our
non-recursive make system.

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 9c0facce2b54ddce48fa619f8e983f2e27124da6..a60ef989f49c21ca49618c56e35baef7a30c11a8 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -76,13 +76,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)