diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-06-26 15:11:28 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-06-26 15:11:28 +0200 |
| commit | edc49a9e9a5777b86a6f16b5d8291a2c87e1859f (patch) | |
| tree | 504162ed49fb93b48104acc0059ee83287b36985 | |
| parent | ec7bef87a629668d5b0f76a6a2e25b2ddf30176d (diff) | |
| download | gnutls-edc49a9e9a5777b86a6f16b5d8291a2c87e1859f.tar.gz | |
Fix installation path of Guile bindings.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | configure.in | 6 |
3 files changed, 11 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 14601abd76..a55659dcd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ # along with this file; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-guile-site-dir +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc SUBDIRS = lgl gl includes lib libextra src @@ -5,6 +5,13 @@ See the end for copying conditions. * Version 1.7.15 (unreleased) +** Guile bindings are now installed under $prefix by default. +Use --without-guile-site-dir to install it under $pkgdatadir/site/ +where $pkgdatadir is as returned by "guile-config info pkgdatadir". +Use --with-guile-site-dir=/your/own/path to specify the path manually. +The default, --with-guile-site-dir, will install the Guile bindings +under $datadir/guile/site. + ** API and ABI modifications: No changes since last version. diff --git a/configure.in b/configure.in index 95fa282935..b8d677e5e8 100644 --- a/configure.in +++ b/configure.in @@ -139,15 +139,15 @@ if test "x$opt_guile_bindings" = "xyes"; then if test $is_guile_1_8 -eq 0; then AC_MSG_RESULT([yes]) case "x$with_guile_site_dir" in - x|xno) + xno) # Use the default $(GUILE_SITE). GUILE_SITE_DIR ;; - xyes) + x|xyes) # Automatically derive $(GUILE_SITE) from $(pkgdatadir). This # hack is used to allow `distcheck' to work (see # `DISTCHECK_CONFIGURE_FLAGS' in the top-level `Makefile.am'). - GUILE_SITE="${datadir}/guile/site" + GUILE_SITE="\$(datadir)/guile/site" AC_SUBST(GUILE_SITE) ;; *) |