diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-07 09:39:13 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-02-07 09:45:41 -0300 |
| commit | 6815d71cff0da41651b12f5b07df8e471969bbec (patch) | |
| tree | 09eb808dbba5a000002e69b47e76eedd4b7448ea | |
| parent | build: prevent make clean error if compile.sh --clean fails (diff) | |
| download | firejail-6815d71cff0da41651b12f5b07df8e471969bbec.tar.gz firejail-6815d71cff0da41651b12f5b07df8e471969bbec.tar.zst firejail-6815d71cff0da41651b12f5b07df8e471969bbec.zip | |
build: fix running make clean with undefined vars
In the `debian_ci` job in .gitlab-ci.yml, dpkg-deb calls `make
distclean` before calling ./configure, which makes `make clean` fail due
to certain variables not being declared:
dpkg-source -i -I --before-build .
[...]
dh_auto_clean
make -j2 distclean
make[1]: Entering directory '/builds/kmk3/firejail_ci'
error: run ./configure to generate config.mk
[...]
rm -f contrib/syntax/files/example [...]
rm -fr - -.tar.xz
rm: invalid option -- '.'
Try 'rm --help' for more information.
make[1]: *** [Makefile:175: clean] Error 1
This amends commit 8a783cdc2 ("build: use TARNAME and remove more paths
on clean", 2023-07-29) / PR #6186.
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
| @@ -174,9 +174,9 @@ clean: | |||
| 174 | $(MAKE) -C test clean | 174 | $(MAKE) -C test clean |
| 175 | rm -f $(SECCOMP_FILTERS) | 175 | rm -f $(SECCOMP_FILTERS) |
| 176 | rm -f $(SYNTAX_FILES) | 176 | rm -f $(SYNTAX_FILES) |
| 177 | rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz | 177 | rm -fr ./$(TARNAME)-$(VERSION) ./$(TARNAME)-$(VERSION).tar.xz |
| 178 | rm -f $(TARNAME)*.deb | 178 | rm -f ./$(TARNAME)*.deb |
| 179 | rm -f $(TARNAME)*.rpm | 179 | rm -f ./$(TARNAME)*.rpm |
| 180 | 180 | ||
| 181 | .PHONY: distclean | 181 | .PHONY: distclean |
| 182 | distclean: clean | 182 | distclean: clean |