aboutsummaryrefslogtreecommitdiff
path: root/Makefile.local
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2017-08-27 15:54:50 -0300
committerDavid Bremner <david@tethera.net>2017-08-27 15:54:50 -0300
commita565f71e1c160431ff99f088bc8fc08d367603a2 (patch)
tree2f7c33d7296e15b2c33f6ede436d412c812c3f15 /Makefile.local
parent00f87faf4bc19e90e19b8b27c13845efb6a68152 (diff)
parent6354745dcd6505c5f12c185a29c25a8d1c240595 (diff)
Merge tag 'debian/0.25-6' into debian/stretch-backports
Diffstat (limited to 'Makefile.local')
-rw-r--r--Makefile.local7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.local b/Makefile.local
index e75b6eae..6bc78ef8 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -31,7 +31,9 @@ $(TAR_FILE):
fi ; \
git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp
echo $(VERSION) > version.tmp
- tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_ --transform 's_.tmp$$__' version.tmp
+ tar --owner root --group root --append -f $(TAR_FILE).tmp \
+ --transform s_^_$(PACKAGE)-$(VERSION)/_ \
+ --transform 's_.tmp$$__' version.tmp
rm version.tmp
gzip < $(TAR_FILE).tmp > $(TAR_FILE)
@echo "Source is ready for release in $(TAR_FILE)"
@@ -210,6 +212,7 @@ dataclean: distclean
rm -rf $(DATACLEAN)
notmuch_client_srcs = \
+ $(notmuch_compat_srcs) \
command-line-arguments.c\
debugger.c \
status.c \
@@ -241,7 +244,7 @@ notmuch_client_modules = $(notmuch_client_srcs:.c=.o)
notmuch.o: version.stamp
-notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libutil.a parse-time-string/libparse-time-string.a
+notmuch: $(notmuch_client_modules) lib/libnotmuch.a util/libnotmuch_util.a parse-time-string/libparse-time-string.a
$(call quiet,CXX $(CFLAGS)) $^ $(FINAL_LIBNOTMUCH_LDFLAGS) -o $@
notmuch-shared: $(notmuch_client_modules) lib/$(LINKER_NAME)