summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2009-08-15 12:05:36 +0200
committerLudovic Courtès <ludo@gnu.org>2009-08-15 12:05:36 +0200
commitc1a15f3dd7788e391db2f6eea9562a3fd9f7a7e9 (patch)
tree1bc5010db4f2fc3ccd5434fd6afd89a3593720a5
parente3c9c676ae8b45ab98296532ac9756566dc46631 (diff)
downloadguile-c1a15f3dd7788e391db2f6eea9562a3fd9f7a7e9.tar.gz
Switch from `guile-1.8.pc' to `guile-2.0.pc'.
* configure.ac: Produce guile-2.0*.pc. * meta/Makefile.am (EXTRA_DIST): Rename guile-1.8*.pc.in to guile-2.0*.pc.in. (pkgconfig_DATA): Update accordingly. * meta/guile-config (guile-module): Likewise.
-rw-r--r--.gitignore3
-rw-r--r--configure.ac4
-rw-r--r--meta/Makefile.am6
-rw-r--r--meta/guile-2.0-uninstalled.pc.in (renamed from meta/guile-1.8-uninstalled.pc.in)0
-rw-r--r--meta/guile-2.0.pc.in (renamed from meta/guile-1.8.pc.in)0
-rwxr-xr-xmeta/guile-config4
6 files changed, 9 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 29f29be5f..9c145efe9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,7 +69,8 @@ guile-readline/guile-readline-config.h
guile-readline/guile-readline-config.h.in
*.go
TAGS
-guile-1.8.pc
+/meta/guile-2.0.pc
+/meta/guile-2.0-uninstalled.pc
gdb-pre-inst-guile
cscope.out
cscope.files
diff --git a/configure.ac b/configure.ac
index 7f6df87ef..ddc092ee9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1539,8 +1539,8 @@ AC_CONFIG_FILES([
testsuite/Makefile
])
-AC_CONFIG_FILES([meta/guile-1.8.pc])
-AC_CONFIG_FILES([meta/guile-1.8-uninstalled.pc])
+AC_CONFIG_FILES([meta/guile-2.0.pc])
+AC_CONFIG_FILES([meta/guile-2.0-uninstalled.pc])
AC_CONFIG_FILES([check-guile], [chmod +x check-guile])
AC_CONFIG_FILES([benchmark-guile], [chmod +x benchmark-guile])
AC_CONFIG_FILES([meta/guile], [chmod +x meta/guile])
diff --git a/meta/Makefile.am b/meta/Makefile.am
index e047038aa..ba79794cf 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -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, 2007, 2008 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@ -23,10 +23,10 @@
bin_SCRIPTS=guile-config guile-tools
EXTRA_DIST= $(bin_SCRIPTS) \
guile.m4 ChangeLog-2008 \
- guile-1.8.pc.in guile-1.8-uninstalled.pc.in
+ guile-2.0.pc.in guile-2.0-uninstalled.pc.in
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = guile-1.8.pc
+pkgconfig_DATA = guile-2.0.pc
## FIXME: in the future there will be direct automake support for
## doing this. When that happens, switch over.
diff --git a/meta/guile-1.8-uninstalled.pc.in b/meta/guile-2.0-uninstalled.pc.in
index 50d337fd3..50d337fd3 100644
--- a/meta/guile-1.8-uninstalled.pc.in
+++ b/meta/guile-2.0-uninstalled.pc.in
diff --git a/meta/guile-1.8.pc.in b/meta/guile-2.0.pc.in
index 1b43cbc5e..1b43cbc5e 100644
--- a/meta/guile-1.8.pc.in
+++ b/meta/guile-2.0.pc.in
diff --git a/meta/guile-config b/meta/guile-config
index 7304ae2a8..6c640c40c 100755
--- a/meta/guile-config
+++ b/meta/guile-config
@@ -4,7 +4,7 @@ exec guile -e main -s $0 "$@"
;;;; guile-config --- utility for linking programs with Guile
;;;; Jim Blandy <jim@red-bean.com> --- September 1997
;;;;
-;;;; Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
+;;;; Copyright (C) 1998, 2001, 2004, 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -71,7 +71,7 @@ exec guile -e main -s $0 "$@"
(dle " " p " --help - show usage info (this message)")
(dle " " p " --help SUBCOMMAND - show help for SUBCOMMAND")))
-(define guile-module "guile-1.8")
+(define guile-module "guile-2.0")
(define (pkg-config . args)
(let* ((real-args (cons "pkg-config" args))