mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-19 18:20:22 +02:00
merge from guile master
Had to fix up .gitignore for some conflicts.
This commit is contained in:
commit
fdc0a82263
205 changed files with 6262 additions and 2236 deletions
|
@ -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
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue