(scm_regexp_exec): Convert string to zero-temrinated locale string

[bpt/guile.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aa8f6e5..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
 
@@ -30,13 +31,11 @@ include_HEADERS = libguile.h
 
 # automake sometimes forgets to distribute acconfig.h,
 # apparently depending on the phase of the moon.
-EXTRA_DIST = HACKING GUILE-VERSION ANON-CVS SNAPSHOTS \
-            $(ACLOCAL) BUGS
+EXTRA_DIST = HACKING GUILE-VERSION ANON-CVS SNAPSHOTS BUGS
 
 TESTS = check-guile
 
-# The rule will cd to $(top_srcdir).
-ACLOCAL = ./guile-aclocal.sh
+ACLOCAL_AMFLAGS = -I guile-config
 
 DISTCLEANFILES = check-guile.log