callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

po-plug-ins, po: (workaround bis) fixing the distcheck job in CI.

Browse Source 
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 dfc4ecfc4c)
This commit is contained in:
Jehan 2020-12-12 21:44:13 +01:00
parent 7d9fd36cd8
commit c7b5464026
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
po-plug-ins/Makefile.in.in
View File

@ -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

11
po/Makefile.in.in
View File

@ -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