From: Carl Worth Date: Fri, 20 Nov 2009 12:07:42 +0000 (+0100) Subject: Makefile: Hard-code emacs_lispdir if emacs pkg-config file not available X-Git-Tag: 0.1~411 X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=0a575c95804da3cb740ebe2fbece862f19dce35a Makefile: Hard-code emacs_lispdir if emacs pkg-config file not available Using pkg-config to find this variable is nice if it works. Go back to the previously used value if it doesn't. --- diff --git a/Makefile b/Makefile index 9e44d90a..0411cbbe 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,10 @@ extra_cflags := $(shell pkg-config --cflags glib-2.0 gmime-2.4 talloc) extra_cxxflags := $(shell xapian-config --cxxflags) emacs_lispdir := $(shell pkg-config emacs --variable sitepkglispdir) +# Hard-code if this system doesn't have an emacs.pc file +ifeq ($(emacs_lispdir),) + emacs_lispdir = $(prefix)/share/site-lisp +endif # Now smash together user's values with our extra values override CFLAGS += $(WARN_FLAGS) $(extra_cflags)