INSTALL: Mention that xapian-config might be named xapian-config-1.1

[notmuch] / Makefile

diff --git a/Makefile b/Makefile
index b6861e9c665c97055499dc28c6f1c82a5188e73e..3fedcf12e87c4cb26005d09953c36f90f2ed12e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ 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
+       emacs_lispdir = $(prefix)/share/emacs/site-lisp
 endif
 
 all_deps = Makefile Makefile.local Makefile.config \
@@ -32,7 +32,7 @@ include lib/Makefile.local
 include Makefile.config
 
 %.o: %.cc $(all_deps)
-       $(CXX) -c $(CFLAGS) $(CXXFLAGS) $< -o $@
+       $(CXX) -c $(CXXFLAGS) $< -o $@
 
 %.o: %.c $(all_deps)
        $(CC) -c $(CFLAGS) $< -o $@