mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-18 01:30:27 +02:00
merge from 1.8
This commit is contained in:
parent
2039f7be7d
commit
9a18d8d431
10 changed files with 207 additions and 51 deletions
|
@ -1,3 +1,9 @@
|
|||
2007-01-04 Kevin Ryde <user42@zip.com.au>
|
||||
|
||||
* Makefile.am (guile-config): Use "|" as the sed delimiter, for the
|
||||
benefit of DOS systems where $(bindir) might include a drive letter
|
||||
like "c:".
|
||||
|
||||
2006-09-19 Rob Browning <rlb@defaultvalue.org>
|
||||
|
||||
* guile-config.in (build-link): Restore the removal of "/usr/lib"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
## Process this file with Automake to create Makefile.in
|
||||
## Jim Blandy <jimb@red-bean.com> --- September 1997
|
||||
##
|
||||
## Copyright (C) 1998, 1999, 2001, 2006 Free Software Foundation, Inc.
|
||||
## Copyright (C) 1998, 1999, 2001, 2006, 2007 Free Software Foundation, Inc.
|
||||
##
|
||||
## This file is part of GUILE.
|
||||
##
|
||||
|
@ -35,7 +35,7 @@ aclocal_DATA = guile.m4
|
|||
guile-config: guile-config.in ${top_builddir}/libguile/libpath.h
|
||||
rm -f guile-config.tmp
|
||||
sed < ${srcdir}/guile-config.in > guile-config.tmp \
|
||||
-e s:@-bindir-@:${bindir}: \
|
||||
-e 's|@-bindir-@|${bindir}|' \
|
||||
-e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
|
||||
chmod +x guile-config.tmp
|
||||
mv guile-config.tmp guile-config
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue