From: Stefano Lattarini Date: Thu, 6 Oct 2011 14:10:40 +0000 (+0200) Subject: maintcheck: fix spurious failure X-Git-Tag: v1.11.1b~16^2~11^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0773a99888c8932c19b61145d78317278d2bdd66;p=thirdparty%2Fautomake.git maintcheck: fix spurious failure * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid complaints from the `sc_no_brace_variable_expansions' maintainer check. --- diff --git a/ChangeLog b/ChangeLog index 875245f2e..bbea2b320 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-10-06 Stefano Lattarini + + maintcheck: fix spurious failure + * lib/am/distdir.am: Use `$(infodir)', not `${infodir}', to avoid + complaints from the `sc_no_brace_variable_expansions' maintainer + check. + 2011-09-26 Stefano Lattarini distuninstallcheck: fail also when only one file is left installed diff --git a/Makefile.in b/Makefile.in index 6897ddcab..1bc1fe847 100644 --- a/Makefile.in +++ b/Makefile.in @@ -146,7 +146,7 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|${prefix}/|' | grep -v '${infodir}/dir$$' + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ diff --git a/lib/am/distdir.am b/lib/am/distdir.am index ceb7e4189..41ff14afa 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -519,9 +519,9 @@ distuninstallcheck_listfiles = find . -type f -print ## The `dir' file (created by install-info) might still exist after ## uninstall, so we must be prepared to account for it. The following ## check is not 100% strict, but is definitely good enough, and even -## accounts for overridden ${infodir}. +## accounts for overridden $(infodir). am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|${prefix}/|' | grep -v '${infodir}/dir$$' + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distuninstallcheck: @test -n '$(distuninstallcheck_dir)' || { \ echo 'ERROR: trying to run $@ with an empty' \