X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=Makefile.global;h=6e17494a5949a934f03e2ed5696c24490b8f290c;hp=7a78e9b567af6ff96d00dddd1f15a5efdccdbaef;hb=0557c5a0333b971188c02c961dec88496f2eed0c;hpb=a34f30888e7874fba2032a066a7babce1dd3f69f diff --git a/Makefile.global b/Makefile.global index 7a78e9b5..6e17494a 100644 --- a/Makefile.global +++ b/Makefile.global @@ -44,7 +44,7 @@ TAR_FILE=$(PACKAGE)-$(VERSION).tar.gz ELPA_FILE:=$(PACKAGE)-emacs-$(ELPA_VERSION).tar DEB_TAR_FILE=$(PACKAGE)_$(VERSION).orig.tar.gz SHA256_FILE=$(TAR_FILE).sha256 -GPG_FILE=$(SHA256_FILE).asc +GPG_FILE=$(TAR_FILE).asc PV_FILE=bindings/python/notmuch/version.py @@ -52,7 +52,7 @@ PV_FILE=bindings/python/notmuch/version.py STD_CFLAGS := -std=gnu99 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(STD_CFLAGS) $(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 +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lnotmuch_util -Llib -lnotmuch ifeq ($(LIBDIR_IN_LDCONFIG),0) FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) endif