X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=5af7852379f494379a320043e9ebacb515c24ef2;hp=21780a6149a1a2b33fc5bdced5f57798ae827524;hb=328626d0fd17910eec5d8b5b51dda46f4bbd8189;hpb=7d9851e293fad762cd959e9be819e48a26087cdc

diff --git a/configure b/configure
index 21780a61..5af78523 100755
--- a/configure
+++ b/configure
@@ -71,7 +71,7 @@ Fine tuning of some installation directories is available:
 	--includedir=DIR	Install header files to DIR [PREFIX/include]
 	--mandir=DIR		Install man pages to DIR [PREFIX/share/man]
 	--sysconfdir=DIR	Read-only single-machine data [PREFIX/etc]
-	--emacslispdir=DIR	Elisp [PREFIX/share/emacs/site-lisp/notmuch]
+	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
 
 Additional options are accepted for compatibility with other
 configure-script calling conventions, but don't do anything yet:
@@ -219,9 +219,9 @@ fi
 
 if [ -z "${EMACSLISPDIR}" ]; then
     if pkg-config --modversion emacs > /dev/null 2>&1; then
-	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)/notmuch
+	EMACSLISPDIR=$(pkg-config emacs --variable sitepkglispdir)
     else
-	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp/notmuch'
+	EMACSLISPDIR='$(prefix)/share/emacs/site-lisp'
     fi
 fi
 
@@ -357,7 +357,7 @@ prefix = ${PREFIX}
 libdir = ${LIBDIR:=\$(prefix)/lib}
 
 # The directory to which header files should be installed
-includedir = ${INCLUDEDIR:=\$(prefix)/lib}
+includedir = ${INCLUDEDIR:=\$(prefix)/include}
 
 # The directory to which man pages should be installed
 mandir = ${MANDIR:=\$(prefix)/share/man}