[gimp/gimp-2-10] po-plug-ins, po: (workaround bis) fixing the distcheck job in CI.

[Jehan <jehanp src gnome org>]

commit c7b5464026d2c7c9a4a13fd902717190b52b000d
Author: Jehan <jehan girinstud io>
Date:   Sat Dec 12 21:44:13 2020 +0100

    po-plug-ins, po: (workaround bis) fixing the distcheck job in CI.
    
    My fix in commit 9e4aa586f7 was not enough because CLEANFILES apparently
    would only be processed on Makefile.am (i.e. with automake). Just remove
    the file explicitly in the distclean rule.
    
    (cherry picked from commit dfc4ecfc4c4bf5ce354c6c884b3c3df742274220)

 po-plug-ins/Makefile.in.in | 11 +++++------
 po/Makefile.in.in          | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/po-plug-ins/Makefile.in.in b/po-plug-ins/Makefile.in.in
index 360ef4be02..1b226257cd 100644
--- a/po-plug-ins/Makefile.in.in
+++ b/po-plug-ins/Makefile.in.in
@@ -160,6 +160,11 @@ clean: mostlyclean
 distclean: clean
        rm -f Makefile Makefile.in POTFILES stamp-it
        rm -f *.mo *.msg *.cat *.cat.m *.gmo
+       # Around December of 2020, a possible change on intltool-merge or some
+       # other dependency in Debian testing broke the CI distcheck job, leaving
+       # some lock files. This CLEANFILES rule should be removed once this is
+       # fixed upstream.
+       rm -f .intltool-merge-cache.lock
 
 maintainer-clean: distclean
        @echo "This command is intended for maintainers to use;"
@@ -218,9 +223,3 @@ stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-# Around December of 2020, a possible change on intltool-merge or some
-# other dependency in Debian testing broke the CI distcheck job, leaving
-# some lock files. This CLEANFILES rule should be removed once this is
-# fixed upstream.
-CLEANFILES += .intltool-merge-cache.lock
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 9a941c1c26..a48e0ea0f0 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -164,6 +164,11 @@ clean: mostlyclean
 distclean: clean
        rm -f Makefile Makefile.in POTFILES stamp-it
        rm -f *.mo *.msg *.cat *.cat.m *.gmo
+       # Around December of 2020, a possible change on intltool-merge or some
+       # other dependency in Debian testing broke the CI distcheck job, leaving
+       # some lock files. This CLEANFILES rule should be removed once this is
+       # fixed upstream.
+       rm -f .intltool-merge-cache.lock
 
 maintainer-clean: distclean
        @echo "This command is intended for maintainers to use;"
@@ -227,9 +232,3 @@ stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
-
-# Around December of 2020, a possible change on intltool-merge or some
-# other dependency in Debian testing broke the CI distcheck job, leaving
-# some lock files. This CLEANFILES rule should be removed once this is
-# fixed upstream.
-CLEANFILES += .intltool-merge-cache.lock