Add the tag list to the unified message metadata pass.

[notmuch] / lib / Makefile.local

diff --git a/lib/Makefile.local b/lib/Makefile.local
index 5233ea6abe908a34647a4a0613c72395fc4a8fa7..431902317053867987da5e412638c0bc2345a398 100644 (file)
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -45,11 +45,12 @@ endif
 endif
 
 dir := lib
-extra_cflags += -I$(dir) -fPIC
+extra_cflags += -I$(srcdir)/$(dir) -fPIC
 
 libnotmuch_c_srcs =            \
        $(notmuch_compat_srcs)  \
        $(dir)/filenames.c      \
+       $(dir)/string-list.c    \
        $(dir)/libsha1.c        \
        $(dir)/message-file.c   \
        $(dir)/messages.c       \
@@ -85,13 +86,13 @@ install: install-$(dir)
 # 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 $(lib)/$(LIBNAME) $(DESTDIR)$(libdir)/
-       ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(SONAME)
-       ln -sf $(LIBNAME) $(DESTDIR)$(libdir)/$(LINKER_NAME)
-       mkdir -p $(DESTDIR)$(includedir)
-       install -m0644 $(lib)/notmuch.h $(DESTDIR)$(includedir)/
+install-$(dir): $(dir)/$(LIBNAME)
+       mkdir -p "$(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 "$(srcdir)/$(lib)/notmuch.h" "$(DESTDIR)$(includedir)/"
        $(LIBRARY_INSTALL_POST_COMMAND)
 
 SRCS  := $(SRCS) $(libnotmuch_c_srcs) $(libnotmuch_cxx_srcs)