diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-08-25 10:24:27 -0400 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-08-25 10:24:27 -0400 |
| commit | d5a1a8cd1bb143e052d6014c160a39665968ded5 (patch) | |
| tree | 8217dccea0af96a2f8b2a86a94e1ab089e1688da | |
| parent | 3c4ecdddabbe5d887aafaa82827643763aa453e7 (diff) | |
| download | guile-d5a1a8cd1bb143e052d6014c160a39665968ded5.tar.gz | |
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.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | libguile/Makefile.am | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 3569868c4..18691c225 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 753f98942..d2772275f 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 |