Fix errors in distclean and maintainer-clean

The variable, LT_ARGZ_H, can be empty, which causes distclean and
maintainer-clean to error as a directory is attempted to be removed
instead of a file.

When running maintainer-clean for gnulib-tests, the .version file is
missing, which is needed by config.status, so the command will error.

* configure.ac: Update CONFIG_STATUS_DEPENDENCIES to use dotversion so
  that the .version file can be generated if needed.
* libltdl/ltdl.mk: Add conditional with LTARGZH_EXISTS to append path for
  LT_ARGZ_H file to BUILT_SOURCES.
* m4/ltdl.m4: Add AM_CONDITIONAL for LTARGZH_EXISTS that is set to
  true if LT_ARGZ_H is non-empty.
* NO-THANKS: Add 'Michael Pratt' for bug#73672 contribution.
* NEWS: List additional bug fix.
This commit is contained in:
Ileana Dumitrescu 2024-10-09 20:02:28 +03:00
parent 82f7f52123
commit d405ede870
No known key found for this signature in database
GPG Key ID: 6570EA01146F7354
5 changed files with 9 additions and 3 deletions

2
NEWS
View File

@ -7,6 +7,8 @@ NEWS - list of user-visible changes between releases of GNU Libtool
- Fix incorrect use of workarounds designed for Darwin versions that
don't have -single_module support.
- Fix errors when executing 'make distclean' and 'make maintainer-clean'.
* Noteworthy changes in release 2.5.3 (2024-09-25) [stable]

View File

@ -49,6 +49,7 @@ Juergen Reuter reuter@theoc01.desy.de
Karl Berry karl@gnu.org
Maciej W. Rozycki macro@linux-mips.org
Manfred Weichel weichel@global.nacamar.de
Michael Pratt mcpratt@pm.me
Mike Gorchak mike@malva.ua
Mo DeJong mdejong@redhat.com
Nick Hudson skrll@netbsd.org

View File

@ -108,7 +108,7 @@ AB_INIT([$autobuild_mode])
dnl Make sure config.status is regenerated when the version timestamp changes
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/.version'])
AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(dotversion)'])
## ------------------------------- ##

View File

@ -131,7 +131,9 @@ EXTRA_DIST += libltdl/COPYING.LIB \
## Gnulib Makefile.am snippets ##
## --------------------------- ##
if LTARGZH_EXISTS
BUILT_SOURCES += libltdl/libltdl/$(LT_ARGZ_H)
endif
EXTRA_DIST += libltdl/libltdl/lt__argz_.h \
libltdl/lt__argz.c

View File

@ -8,7 +8,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 23 LTDL_INIT
# serial 24 LTDL_INIT
# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
# ------------------------------------------
@ -435,7 +435,8 @@ esac
m4_ifdef([AM_CONDITIONAL],
[AM_CONDITIONAL(INSTALL_LTDL, test no != "${enable_ltdl_install-no}")
AM_CONDITIONAL(CONVENIENCE_LTDL, test no != "${enable_ltdl_convenience-no}")])
AM_CONDITIONAL(CONVENIENCE_LTDL, test no != "${enable_ltdl_convenience-no}")
AM_CONDITIONAL(LTARGZH_EXISTS, test -n "$LT_ARGZ_H")])
])# _LT_ENABLE_INSTALL