summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2020-01-21 17:51:37 +0100
committerLudovic Courtès <ludo@gnu.org>2020-01-21 17:51:37 +0100
commit491cc23f93f622e067e120f875424ed76d73cf8f (patch)
tree805fcd2215e733fcde13fd5dfb5fa0555b0b8833
parentf329837fd17e462068260589138054a5c0e586b2 (diff)
downloadguile-491cc23f93f622e067e120f875424ed76d73cf8f.tar.gz
build: Actually install libguile-3.0-gdb.scm.
Reported by brandelune on #guile. * libguile/libguile-2.2-gdb.scm: Rename to... * libguile/libguile-3.0-gdb.scm: ... this. * libguile/Makefile.am (install-data-hook): Replace hard-coded "2.2" with @GUILE_EFFECTIVE_VERSION@.
-rw-r--r--libguile/Makefile.am8
-rw-r--r--libguile/libguile-3.0-gdb.scm (renamed from libguile/libguile-2.2-gdb.scm)0
2 files changed, 4 insertions, 4 deletions
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 43411c5a7..d4cfec7a3 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with Automake to create Makefile.in
##
-## Copyright (C) 1998-2004, 2006-2014, 2016-2019
+## Copyright (C) 1998-2004, 2006-2014, 2016-2020
## Free Software Foundation, Inc.
##
## This file is part of GUILE.
@@ -491,9 +491,9 @@ INSTANTIATE = \
-e 's,[@]pkglibdir[@],$(pkglibdir),g' \
-e 's,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g'
-install-data-hook: libguile-2.2-gdb.scm
+install-data-hook: libguile-@GUILE_EFFECTIVE_VERSION@-gdb.scm
@$(MKDIR_P) $(DESTDIR)$(libdir)
-## We want to install libguile-2.2-gdb.scm as SOMETHING-gdb.scm.
+## We want to install libguile-X.Y-gdb.scm as SOMETHING-gdb.scm.
## SOMETHING is the full name of the final library. We want to ignore
## symlinks, the .la file, and any previous -gdb.py file. This is
## inherently fragile, but there does not seem to be a better option,
@@ -731,7 +731,7 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads \
cpp-E.syms cpp-E.c cpp-SIG.syms cpp-SIG.c \
c-tokenize.lex \
scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map \
- vm-operations.h libguile-2.2-gdb.scm \
+ vm-operations.h libguile-@GUILE_EFFECTIVE_VERSION@-gdb.scm \
$(lightening_c_files) $(lightening_extra_files)
# $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
# guile-procedures.txt guile.texi
diff --git a/libguile/libguile-2.2-gdb.scm b/libguile/libguile-3.0-gdb.scm
index e0b573a20..e0b573a20 100644
--- a/libguile/libguile-2.2-gdb.scm
+++ b/libguile/libguile-3.0-gdb.scm