[geany/geany] 2977a9: Remove left over lock file from intltool on "make distcheck"

Enrico Tröger git-noreply at xxxxx
Sat Oct 9 10:08:10 UTC 2021


Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sat, 09 Oct 2021 10:08:10 UTC
Commit:      2977a91f6425d7062dc2d9130720ff5cdeff7dc1
             https://github.com/geany/geany/commit/2977a91f6425d7062dc2d9130720ff5cdeff7dc1

Log Message:
-----------
Remove left over lock file from intltool on "make distcheck"

Debian and ArchLinux (and maybe more) patched their "intltool" package
to use a lock file. But this lock file is not removed after its use and
so "make distcheck" complains about it.


Modified Paths:
--------------
    Makefile.am

Modified: Makefile.am
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -35,6 +35,12 @@ DISTCLEANFILES = \
 uninstall-local:
 	rm -rf $(DESTDIR)$(pkgdatadir);
 
+# Remove po/.intltool-merge-cache.lock on "distcheck" which is left over by various incorrectly
+# patched versions of intltool, e.g. https://bugs.archlinux.org/task/67098 or
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=991623
+distclean-local:
+	rm -f $(top_builddir)/po/.intltool-merge-cache.lock
+
 # manually install some files under another name
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).


More information about the Commits mailing list