[Guile-commits] GNU Guile branch, master, updated. release_1-9-11-273-gd5a1a8c

[Andy Wingo]

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=d5a1a8cd1bb143e052d6014c160a39665968ded5

The branch, master has been updated
       via  d5a1a8cd1bb143e052d6014c160a39665968ded5 (commit)
      from  3c4ecdddabbe5d887aafaa82827643763aa453e7 (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 d5a1a8cd1bb143e052d6014c160a39665968ded5
Author: Andy Wingo <address@hidden>
Date:   Wed Aug 25 10:24:27 2010 -0400

    consolidate sitedir definition
    
    * configure.ac (sitedir): Fix definition to point to the
      version-specific sitedir.
    
    * libguile/Makefile.am (libpath.h): Take sitedir definition from
      configure.ac.

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

Summary of changes:
 configure.ac         |    5 ++---
 libguile/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3569868..18691c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1596,10 +1596,9 @@ AC_SUBST(top_builddir_absolute)
 top_srcdir_absolute=`(cd $srcdir && pwd)`
 AC_SUBST(top_srcdir_absolute)
 
-dnl We need `sitedir' in `guile-1.8.pc'.
-dnl Note: `sitedir' must be kept in sync with `GUILE_SITE_DIR' in `guile.m4'.
+dnl `sitedir' goes into libpath.h and the pkg-config file.
 pkgdatadir="$datadir/$PACKAGE_TARNAME"
-sitedir="$pkgdatadir/site"
+sitedir="$pkgdatadir/site/$GUILE_EFFECTIVE_VERSION"
 AC_SUBST([sitedir])
 
 # Additional SCM_I_GSC definitions are above.
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 753f989..d277227 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -606,7 +606,7 @@ libpath.h: $(srcdir)/Makefile.in  
$(top_builddir)/config.status
        @echo '/* generated by Makefile */' > libpath.tmp
        @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp
        @echo '#define SCM_LIBRARY_DIR 
"$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp
-       @echo '#define SCM_SITE_DIR 
"$(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)"' >> libpath.tmp
+       @echo '#define SCM_SITE_DIR "$(sitedir)"' >> libpath.tmp
        @echo '#define SCM_GLOBAL_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp
        @echo '#define SCM_LIB_DIR "$(libdir)"' >> libpath.tmp
        @echo '#define SCM_EXTENSIONS_DIR 
"$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/extensions"' >> libpath.tmp


hooks/post-receive
-- 
GNU Guile