mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-26 20:57:58 +01:00
ded713c39d
We will need this for improved folder search tests, but having some folders should exercise our code paths better anyway. Modify the relevant test accordingly to make it pass. This reorganization triggers a bug in the test suite, namely that it expects the output of --output=files to be in a certain order. So we add the fix for that into the same commit. This mainly involves sorting, although the case --duplicate=$n requires more subtlety.
39 lines
1.3 KiB
Text
39 lines
1.3 KiB
Text
From: "Jan Janak" <jan@ryngle.com>
|
|
To: notmuch@notmuchmail.org
|
|
Date: Tue, 17 Nov 2009 23:18:47 +0100
|
|
Subject: [notmuch] [PATCH] Older versions of install do not support -C.
|
|
Message-ID: <1258496327-12086-1-git-send-email-jan@ryngle.com>
|
|
|
|
Do not use -C cmdline option of install, older versions, commonly found in
|
|
distributions like Debian, do not seem to support it. Running make install
|
|
on such systems (tested on Debian Lenny) fails.
|
|
|
|
Signed-off-by: Jan Janak <jan at ryngle.com>
|
|
---
|
|
Makefile.local | 8 ++++----
|
|
1 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Makefile.local b/Makefile.local
|
|
index f824bed..f51f1d1 100644
|
|
--- a/Makefile.local
|
|
+++ b/Makefile.local
|
|
@@ -27,11 +27,11 @@ install: all notmuch.1.gz
|
|
for d in $(DESTDIR)$(prefix)/bin/ $(DESTDIR)$(prefix)/share/man/man1 \
|
|
$(DESTDIR)/etc/bash_completion.d/ ; \
|
|
do \
|
|
- install -C -d $$d ; \
|
|
+ install -d $$d ; \
|
|
done ;
|
|
- install -C notmuch $(DESTDIR)$(prefix)/bin/
|
|
- install -C -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
|
|
- install -C notmuch-completion.bash \
|
|
+ install notmuch $(DESTDIR)$(prefix)/bin/
|
|
+ install -m0644 notmuch.1.gz $(DESTDIR)$(prefix)/share/man/man1/
|
|
+ install notmuch-completion.bash \
|
|
$(DESTDIR)/etc/bash_completion.d/notmuch
|
|
|
|
SRCS := $(SRCS) $(notmuch_client_srcs)
|
|
--
|
|
1.6.3.3
|
|
|
|
|