[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.6-23-g068adc1

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=068adc1980535f187ad9721d67f223c52546c38a

The branch, stable-2.0 has been updated
       via  068adc1980535f187ad9721d67f223c52546c38a (commit)
       via  8a84f7fb46182c9220da514bc25d85ee799c799f (commit)
       via  a8872c78a4baa6c98e60924919d9adb7e651a7df (commit)
      from  d6bd18261895a9b7cb9570c95b779c615e261728 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 068adc1980535f187ad9721d67f223c52546c38a
Author: Ludovic Courtès <address@hidden>
Date:   Mon Sep 3 22:40:46 2012 +0200

    build: Fix race between installing `guild' and the `guile-tools' symlink.
    
    Fixes <http://bugs.gnu.org/12015>.
    Report and patch by Song.Li <address@hidden>.
    
    * meta/Makefile.am (install-data-hook): Rename to...
      (install-exec-hook): ... this.

commit 8a84f7fb46182c9220da514bc25d85ee799c799f
Author: Ludovic Courtès <address@hidden>
Date:   Mon Sep 3 22:35:33 2012 +0200

    doc: Use scm_{to,from}_double instead of old API in example.
    
    Fixed <http://bugs.gnu.org/12241>.
    Reported by Kurt W. Gochko <address@hidden>.
    
    * doc/ref/tour.texi (Writing Guile Extensions): Change example to use
      scm_{to,from}_double instead of the pre-1.8 API.

commit a8872c78a4baa6c98e60924919d9adb7e651a7df
Author: Ludovic Courtès <address@hidden>
Date:   Mon Sep 3 22:33:45 2012 +0200

    build: Use Automake's `color-tests'.
    
    * configure.ac: Use Automake's `color-tests'.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac      |    2 +-
 doc/ref/tour.texi |    6 +++---
 meta/Makefile.am  |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 32a6760..52fff69 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(GUILE-VERSION)
 
 dnl `AM_SUBST_NOTMAKE' was introduced in Automake 1.11.
-AM_INIT_AUTOMAKE([1.11 gnu no-define -Wall -Wno-override dist-xz])
+AM_INIT_AUTOMAKE([1.11 gnu no-define -Wall -Wno-override color-tests dist-xz])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], 
[AC_SUBST([AM_DEFAULT_VERBOSITY],1)])
 
 AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
diff --git a/doc/ref/tour.texi b/doc/ref/tour.texi
index 3e61269..0924216 100644
--- a/doc/ref/tour.texi
+++ b/doc/ref/tour.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006, 
2010, 2011
address@hidden   Free Software Foundation, Inc.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2006, 
2010, 2011,
address@hidden   2012 Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
 @raisesections
@@ -149,7 +149,7 @@ that makes the @code{j0} function available to Scheme code.
 SCM
 j0_wrapper (SCM x)
 @{
-  return scm_make_real (j0 (scm_num2dbl (x, "j0")));
+  return scm_from_double (j0 (scm_to_double (x)));
 @}
 
 void
diff --git a/meta/Makefile.am b/meta/Makefile.am
index a05730d..bd20784 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST= \
   guild.in guile-config.in
 
 # What we now call `guild' used to be known as `guile-tools'.
-install-data-hook:
+install-exec-hook:
        guild="`echo $(ECHO_N) guild                            \
           | $(SED) -e '$(program_transform_name)'`$(EXEEXT)" ; \
        guile_tools="`echo $(ECHO_N) guile-tools                \


hooks/post-receive
-- 
GNU Guile