Merge branch 'makeinfo_out_of_tree' into for-steve

diff --git a/Makefile.am b/Makefile.am
index d6e7cbf..1cefe3a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ sxe_subdirs += lib-src
 if DESCEND_MODULES
 sxe_subdirs += modules
 endif
-sxe_subdirs += src lisp src lisp info etc tests
+sxe_subdirs += src lisp info etc tests
 
 SUBDIRS =
 SUBDIRS += $(sxe_subdirs)

diff --git a/info/Makefile.am b/info/Makefile.am
index 7449556..12f2219 100644 (file)
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -25,6 +25,11 @@
 LANG=C
 LC_ALL=C
 
+builddir = @builddir@
+srcdir = @srcdir@
+
+SUBDIRS=
+
 info_TEXINFOS =
 info_TEXINFOS += cl.texi
 info_TEXINFOS += custom.texi