From 8d282adf53148469c3d6a9d41346919aa70028af Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Sun, 23 Oct 2011 16:44:01 +0200 Subject: [PATCH] Prefix lib/notmuch.h and lib/gen-version-script.sh with $(srcdir) lib/notmuch.h and lib/gen-version-script.sh couldn't have been found when building out of sources directory. --- lib/Makefile.local | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/lib/Makefile.local b/lib/Makefile.local index ea20b2b3..be51eaa1 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -41,6 +41,11 @@ endif dir := lib extra_cflags += -I$(srcdir)/$(dir) -fPIC +# The (often-reused) $dir works fine within targets/prerequisites, +# but cannot be used reliably within commands, so copy its value to a +# variable that is not reused. +lib := $(dir) + libnotmuch_c_srcs = \ $(notmuch_compat_srcs) \ $(dir)/filenames.c \ @@ -68,8 +73,8 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules) $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@ -notmuch.sym: lib/notmuch.h $(libnotmuch_modules) - sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@ +notmuch.sym: $(srcdir)/$(dir)/notmuch.h $(libnotmuch_modules) + sh $(srcdir)/$(lib)/gen-version-script.sh $< $(libnotmuch_modules) > $@ $(dir)/$(SONAME): $(dir)/$(LIBNAME) ln -sf $(LIBNAME) $@ @@ -79,10 +84,6 @@ $(dir)/$(LINKER_NAME): $(dir)/$(SONAME) install: install-$(dir) -# The (often-reused) $dir works fine within targets/prerequisites, -# but cannot be used reliably within commands, so copy its value to a -# variable that is not reused. -lib := $(dir) install-$(dir): $(dir)/$(LIBNAME) mkdir -p "$(DESTDIR)$(libdir)/" install -m0644 "$(lib)/$(LIBNAME)" "$(DESTDIR)$(libdir)/" -- 2.43.0