diff options
| author |  David Bremner <david@tethera.net> | 2014-05-28 09:50:32 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2014-05-28 09:50:32 -0300 |
| commit | 94064a6ba2f67005352915dc01c6eb0e19b761f9 (patch) | |
| tree | 61f9fc6c78daafa39a93cdcd9336d246b240bd48 /Makefile.local | |
| parent | ec020894331b0ef9b594cdc47f4b79abeda4f9cd (diff) | |
| parent | 90f9a5e65e8dab3fad0a60530d3ffc582f1b1a93 (diff) | |
Merge branch 'release'
A point release is slowly being built on branch release. Merge those
changes into master.
Diffstat (limited to 'Makefile.local')
| -rw-r--r-- | Makefile.local | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.local b/Makefile.local index fa07d81b..af79b5c7 100644 --- a/Makefile.local +++ b/Makefile.local @@ -46,15 +46,16 @@ PV_FILE=bindings/python/notmuch/version.py # Smash together user's values with our extra values FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS) FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS) -FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS) +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch +ifeq ($(LIBDIR_IN_LDCONFIG),0) +FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) +endif +FINAL_NOTMUCH_LDFLAGS += $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS) FINAL_NOTMUCH_LINKER = CC ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1) FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS) FINAL_NOTMUCH_LINKER = CXX endif -ifeq ($(LIBDIR_IN_LDCONFIG),0) -FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) -endif FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS) .PHONY: all |