Makefile: Add the emacs directory to load-path when compiling

[notmuch] / Makefile.local

diff --git a/Makefile.local b/Makefile.local
index e9f86e0d703c696c785d3619df0e9299905ce3fd..c3fc7c5ca14e67953b7526485bccdb14b51740a6 100644 (file)
--- a/Makefile.local
+++ b/Makefile.local
@@ -36,6 +36,8 @@ FINAL_LDFLAGS = $(LDFLAGS) $(CONFIGURE_LDFLAGS)
 
 all: notmuch notmuch-shared notmuch.1.gz
 ifeq ($(MAKECMDGOALS),)
+ifeq ($(shell cat .first-build-message),)
+       @NOTMUCH_FIRST_BUILD=1 $(MAKE) --no-print-directory all
        @echo ""
        @echo "Compilation of notmuch is now complete. You can install notmuch with:"
        @echo ""
@@ -44,6 +46,8 @@ ifeq ($(MAKECMDGOALS),)
        @echo "Note that depending on the prefix to which you are installing"
        @echo "you may need root permission (such as \"sudo make install\")."
        @echo "See \"./configure --help\" for help on setting an alternate prefix."
+       @echo Printed > .first-build-message
+endif
 endif
 
 # The user has not set any verbosity, default to quiet mode and inform the
@@ -74,7 +78,7 @@ quiet_symlink = $(call quiet_args,SYMLINK,$1)
        $(call quiet,CC,$(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@
 
 %.elc: %.el
-       $(call quiet,EMACS) -batch -f batch-byte-compile $<
+       $(call quiet,EMACS) --directory emacs -batch -f batch-byte-compile $<
 
 .deps/%.d: %.c $(global_deps)
        @set -e; rm -f $@; mkdir -p $$(dirname $@) ; \