diff options
| author | Andy Wingo <wingo@pobox.com> | 2008-08-26 12:51:19 -0700 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2008-08-26 12:51:19 -0700 |
| commit | fdc0a82263cb3793cb92d802431162a50f12674c (patch) | |
| tree | f0911bbf8fc1f4d4b6d42ea89397f689135fe04a /guile-readline | |
| parent | ce66d60be23a0b151b6471896d3727601173907a (diff) | |
| parent | 582a4997abc8b34ac6caf374fda8ea3ac65bd571 (diff) | |
merge from guile master
Had to fix up .gitignore for some conflicts.
Diffstat (limited to 'guile-readline')
| -rw-r--r-- | guile-readline/ChangeLog | 11 | ||||
| -rw-r--r-- | guile-readline/configure.in | 7 | ||||
| -rw-r--r-- | guile-readline/ice-9/Makefile.am | 7 |
3 files changed, 21 insertions, 4 deletions
diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog index 3163b5f18..2188b78e1 100644 --- a/guile-readline/ChangeLog +++ b/guile-readline/ChangeLog @@ -1,3 +1,14 @@ +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 + available on MacOS X; use `patsubst' instead to remove the + newline. Reported by Steven Wu <wus@qwest.net>. + 2008-02-16 Ludovic Courtès <ludo@gnu.org> * LIBGUILEREADLINE-VERSION diff --git a/guile-readline/configure.in b/guile-readline/configure.in index d0fda02a1..9098a31e6 100644 --- a/guile-readline/configure.in +++ b/guile-readline/configure.in @@ -1,7 +1,12 @@ AC_PREREQ(2.50) +dnl Don't use "echo -n", which is not portable (e.g., not available on +dnl MacOS X). Instead, use `patsubst' to remove the newline. AC_INIT(guile-readline, - m4_esyscmd(. ../GUILE-VERSION && echo -n ${GUILE_VERSION})) + patsubst(m4_esyscmd(. ../GUILE-VERSION && echo ${GUILE_VERSION}), [ +]), + [bug-guile@gnu.org]) + AC_CONFIG_AUX_DIR([.]) AC_CONFIG_SRCDIR(readline.c) AM_CONFIG_HEADER([guile-readline-config.h]) 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) |