From b4d0b24c533c8aebb8961bf658e3b41580b073e2 Mon Sep 17 00:00:00 2001 From: "Kelvin M. Klann" Date: Fri, 27 May 2022 15:10:46 -0300 Subject: fj-mkdeb.py: run distclean before ./configure This (mostly) restores the behavior from before commit 1fb814e51 ("Makefile.in: stop running distclean on dist", 2022-05-13) / PR #5142. ./configure still has to be called before calling ./contrib/fj-mkdeb.py (to generate Makefile from Makefile.in before calling `make distclean`). --- contrib/fj-mkdeb.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'contrib') diff --git a/contrib/fj-mkdeb.py b/contrib/fj-mkdeb.py index 60e25fd14..75fb6cbc8 100755 --- a/contrib/fj-mkdeb.py +++ b/contrib/fj-mkdeb.py @@ -29,6 +29,12 @@ def run(srcdir, args): else: escaped_args.append(shlex.quote(a)) + # Remove generated files. + if not dry_run: + distclean = subprocess.call(['make', 'distclean']) + if distclean != 0: + return distclean + # Run configure to generate mkdeb.sh. first_config = subprocess.call(['./configure', '--prefix=/usr'] + args) if first_config != 0: -- cgit v1.2.3-54-g00ecf