Changes to build and install files in emacs subdir.

diff --git a/ChangeLog b/ChangeLog
index a900024..d62c4ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-30  Neil Jerram  <neil@ossau.uklinux.net>
+
+       * configure.in (AC_CONFIG_FILES): Add `emacs/Makefile'.
+       (AM_PATH_LISPDIR): Added.
+
+       * Makefile.am (SUBDIRS): Add `emacs'.
+
 2003-07-27  Marius Vollmer  <mvo@zagadka.de>
 
        * configure.in: Look for sched_yield in -lrt; this is needed for

diff --git a/Makefile.am b/Makefile.am
index 70730cb..5af6611 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,8 @@
 AUTOMAKE_OPTIONS = 1.5
 
 SUBDIRS = oop libguile-ltdl libguile ice-9 guile-config guile-readline \
-         scripts srfi doc examples test-suite benchmark-suite lang am
+         scripts srfi doc examples test-suite benchmark-suite lang am \
+         emacs
 
 bin_SCRIPTS = guile-tools
 

diff --git a/configure.in b/configure.in
index 72d834b..275ed7b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -62,6 +62,8 @@ AC_LIB_LTDL
 AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
 AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
 
+AM_PATH_LISPDIR
+
 #--------------------------------------------------------------------
 #
 # User options (after above tests that may set default CFLAGS etc.)
@@ -1086,6 +1088,7 @@ AC_CONFIG_FILES([
   doc/r5rs/Makefile
   doc/ref/Makefile
   doc/tutorial/Makefile
+  emacs/Makefile
   examples/Makefile
   examples/box-dynamic-module/Makefile
   examples/box-dynamic/Makefile