Remove uses of non-portable makefile constructs.

diff --git a/NEWS b/NEWS
index 46e48ce1e13e0c36fc98bef325a5dd651f3882da..94eb5b33772d916db0cbfba331a32d1ffdaab80b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -67,6 +67,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 e0862c507a082a3ecd2bf2a3722aa3887c932b96..bb08ca2a1d733455cd225828a9717d9245d44dde 100644 (file)
--- 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 76a66f0c92b3e6129e1cea4eddc8d079d341114d..70a966b1a480a4bb61b7540dec27c7119b6d2fb2 100644 (file)
--- 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.
 ##
@@ -84,6 +84,7 @@ 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)/$@
 
 MAINTAINERCLEANFILES = autoconf-macros.texi

diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 69ae5f082a80222f9ea037c2354973bba938487f..47981f7e2cb89ace134500f35c3484b4bdf024a0 100644 (file)
--- 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 1917c76fcb02d7c2e69f97d1435f01b551bdaf98..d1e7c8270afe5f5e45c65e0dfbf6f66426739ba3 100644 (file)
--- 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)