From: Peter Wang <novalazy@gmail.com>
Date: Thu, 19 Nov 2009 08:13:35 +0000 (+1100)
Subject: Put $(LDFLAGS) after the list of object files.
X-Git-Tag: 0.1~419
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=ddac17343a30976cae82c9f57419c063e1585cc0

Put $(LDFLAGS) after the list of object files.

Some linkers on some systems are particularly picky about the order of
arguments in order to properly linkt. So this fixes failures on some
systems.
---

diff --git a/Makefile.local b/Makefile.local
index 6bc01a5d..c44d1603 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -18,7 +18,7 @@ notmuch_client_srcs =		\
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
-	$(CXX) $(LDFLAGS) $^ -o $@
+	$(CXX) $^ $(LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
 	gzip --stdout notmuch.1 > notmuch.1.gz
diff --git a/notmuch-completion.bash b/notmuch-completion.bash
index 8665268c..03412117 100644
--- a/notmuch-completion.bash
+++ b/notmuch-completion.bash
@@ -50,7 +50,7 @@ _notmuch()
 
     commands="setup new search show reply tag dump restore help"
     help_options="setup new search show reply tag dump restore search-terms"
-    search_options="--max-threads= --first= --sort="
+    search_options="--max-threads= --first= --sort=oldest-first --sort=newest-first"
 
     COMPREPLY=()