add_files_recursive: Separate scanning for directories and files for legibility.

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index 4b29ad832324ef55dbdff1a1f3a72e8a972f3286..933ff4c7de7f8624ce0169e535a1be0d9b2a1579 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -22,7 +22,7 @@ notmuch_client_srcs =         \
 
 notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
 notmuch: $(notmuch_client_modules) lib/notmuch.a
-       $(call quiet,CXX) $^ $(LDFLAGS) -o $@
+       $(call quiet,CXX,$(LDFLAGS)) $^ $(FINAL_LDFLAGS) -o $@
 
 notmuch.1.gz: notmuch.1
        $(call quiet,gzip) --stdout $^ > $@
@@ -45,7 +45,7 @@ install-emacs: install emacs
 
 install-bash:
        install -d $(DESTDIR)$(bash_completion_dir)
-       install contrib/notmuch-completion.bash \
+       install -m0644 contrib/notmuch-completion.bash \
                $(DESTDIR)$(bash_completion_dir)/notmuch
 
 SRCS  := $(SRCS) $(notmuch_client_srcs)