[Guile-commits] 01/02: build: Actually install libguile-3.0-gdb.scm.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guile.

commit 491cc23f93f622e067e120f875424ed76d73cf8f
Author: Ludovic Courtès <address@hidden>
AuthorDate: Tue Jan 21 17:51:37 2020 +0100

    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@.
---
 libguile/Makefile.am                                    | 8 ++++----
 libguile/{libguile-2.2-gdb.scm => libguile-3.0-gdb.scm} | 0
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 43411c5..d4cfec7 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-@address@hidden
        @$(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-@address@hidden           \
     $(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
similarity index 100%
rename from libguile/libguile-2.2-gdb.scm
rename to libguile/libguile-3.0-gdb.scm