--- orig/guile-core/guile-readline/ChangeLog
+++ mod/guile-core/guile-readline/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-07  Richard Todd  <address@hidden>
+
+	* Makefile.am (ice-9/readline.scm): link to $srcdir, so VPATH builds 
+	work.  Make the link depend on the source file, so that it doesn't 
+	get re-made as a root link during 'sudo make install', for instance.
+
 2003-05-04  Marius Vollmer  <address@hidden>
 
 	* configure.in: When checking whether readline clears SA_RESTART,


--- orig/guile-core/guile-readline/Makefile.am
+++ mod/guile-core/guile-readline/Makefile.am
@@ -57,11 +57,15 @@
 
 CLEANFILES = *.x
 
-ice-9/readline.scm:
+ice-9/readline.scm: readline.scm
 	-rm ice-9/readline.scm
 	-rmdir ice-9
 	mkdir ice-9
-	cd ice-9 && ln -s ../readline.scm
+	if [ "$(top_srcdir)" == "$(top_builddir)" ] ; then \
+             (cd ice-9 && $(LN_S) ../$<)  \
+        else \
+             (cd ice-9 && $(LN_S) $<) \
+        fi
 
 all-local: ice-9/readline.scm