aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-05-27 15:10:46 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-05-27 18:21:08 -0300
commitb4d0b24c533c8aebb8961bf658e3b41580b073e2 (patch)
tree7398b81e41e88ff3fac3c510d294c699227d9b9e /contrib
parentmkdeb.sh.in: remove unused PACKAGE_TARNAME/TOP vars (diff)
downloadfirejail-b4d0b24c533c8aebb8961bf658e3b41580b073e2.tar.gz
firejail-b4d0b24c533c8aebb8961bf658e3b41580b073e2.tar.zst
firejail-b4d0b24c533c8aebb8961bf658e3b41580b073e2.zip
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`).
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fj-mkdeb.py6
1 files changed, 6 insertions, 0 deletions
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):
29 else: 29 else:
30 escaped_args.append(shlex.quote(a)) 30 escaped_args.append(shlex.quote(a))
31 31
32 # Remove generated files.
33 if not dry_run:
34 distclean = subprocess.call(['make', 'distclean'])
35 if distclean != 0:
36 return distclean
37
32 # Run configure to generate mkdeb.sh. 38 # Run configure to generate mkdeb.sh.
33 first_config = subprocess.call(['./configure', '--prefix=/usr'] + args) 39 first_config = subprocess.call(['./configure', '--prefix=/usr'] + args)
34 if first_config != 0: 40 if first_config != 0: