From a728672018cda71c77016555a69011bdc269c8fd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 7 May 2008 19:57:40 +0200
Subject: [PATCH] Remove uses of non-portable makefile constructs.

---
 NEWS                             | 1 +
 doc/ref/ChangeLog                | 6 ++++++
 doc/ref/Makefile.am              | 5 +++--
 guile-readline/ChangeLog         | 5 +++++
 guile-readline/ice-9/Makefile.am | 7 ++++---
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 31a5313a1..5f84659c0 100644
--- a/NEWS
+++ b/NEWS
@@ -98,6 +98,7 @@ lead to a stack overflow.
 ** Fixed build issue with DEC/Compaq/HP's compiler
 ** Fixed `scm_from_complex_double' build issue on FreeBSD
 ** Fixed `alloca' build issue on FreeBSD 6
+** Removed use of non-portable makefile constructs
 ** Fixed shadowing of libc's <random.h> on Tru64, which broke compilation
 ** Make sure all tests honor `$TMPDIR'
 
diff --git a/doc/ref/ChangeLog b/doc/ref/ChangeLog
index d39180df4..275a2a166 100644
--- a/doc/ref/ChangeLog
+++ b/doc/ref/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-07  Ludovic Courtès  <ludo@gnu.org>
+
+	* Makefile.am (autoconf-macros.texi): Avoid use of GNU Make
+	specific `$<' variable.  This broke with BSD Make as found on
+	FreeBSD 6.2.
+
 2008-05-05  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* scheme-using.texi (Using Guile in Emacs): Add concept index
diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 6ab2171af..60e23c27d 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 2004, 2006 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 2004, 2006, 2008 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -86,7 +86,8 @@ include $(top_srcdir)/am/pre-inst-guile
 
 autoconf.texi: autoconf-macros.texi
 autoconf-macros.texi: $(top_srcdir)/guile-config/guile.m4
-	$(preinstguiletool)/snarf-guile-m4-docs $< > $(srcdir)/$@
+	$(preinstguiletool)/snarf-guile-m4-docs $(top_srcdir)/guile-config/guile.m4 \
+	  > $(srcdir)/$@
 
 lib-version.texi: $(top_srcdir)/GUILE-VERSION
 	cat "$^" | grep '^LIBGUILE_.*_MAJOR' |				\
diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index f8d393f16..2188b78e1 100644
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-07  Ludovic Courtès  <ludo@gnu.org>
+
+	* ice-9/Makefile.am (guile_pdd): Don't use `patsubst': it's GNU
+	Make and broke BSD Make as found on FreeBSD 6.2.
+
 2008-04-16  Ludovic Courtès  <ludo@gnu.org>
 
 	* configure.in (AC_INIT): Don't use "echo -n", which is not
diff --git a/guile-readline/ice-9/Makefile.am b/guile-readline/ice-9/Makefile.am
index 1917c76fc..d1e7c8270 100644
--- a/guile-readline/ice-9/Makefile.am
+++ b/guile-readline/ice-9/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
-##  	Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -20,7 +19,9 @@
 ##   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
 ##   Floor, Boston, MA 02110-1301 USA
 
-guile_pdd = $(patsubst %/guile-readline,%/guile,$(pkgdatadir))
+# Guile's `pkgdatadir'.
+guile_pdd = $(datadir)/guile
+
 ice9dir = $(guile_pdd)/$(GUILE_EFFECTIVE_VERSION)/ice-9
 ice9_DATA = readline.scm
 ETAGS_ARGS = $(ice9_DATA)
-- 
2.20.1