From: Noam Postavsky <npostavs@gmail.com>
Date: Sat, 25 Aug 2018 22:55:11 +0000 (-0400)
Subject: ; Fix out-of-tree build for mod-test.so
X-Git-Tag: emacs-26.1.90~191
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=769d0cdaa9a986b74e30dfc589e1fa8115e1d401;p=emacs.git

; Fix out-of-tree build for mod-test.so

* test/Makefile.in: Don't look for emacs-module.h in $(srcdir), since
it is generated.
---

diff --git a/test/Makefile.in b/test/Makefile.in
index 597ef913113..c0a073338ef 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -231,12 +231,14 @@ else
 FPIC_CFLAGS = -fPIC
 endif
 
-MODULE_CFLAGS = -I$(srcdir)/../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
+# Note: emacs-module.h is generated from emacs-module.h.in, hence we
+# look in ../src, not $(srcdir)/../src.
+MODULE_CFLAGS = -I../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
   $(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
 
 test_module = $(test_module_dir)/mod-test${SO}
 src/emacs-module-tests.log: $(test_module)
-$(test_module): $(test_module:${SO}=.c) $(srcdir)/../src/emacs-module.h
+$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h
 	$(AM_V_CCLD)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \
 	  -o $@ $<
 endif