aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.in
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-08 00:25:14 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2022-06-08 12:13:40 -0300
commit56b86f8ace0962bc5e8f59a15c4ff423c80e4f9b (patch)
tree06c9caf7fabda6f7de6e4dd553acbd5b04e26180 /Makefile.in
parentRELNOTES: add feature/bugfix (diff)
downloadfirejail-56b86f8ace0962bc5e8f59a15c4ff423c80e4f9b.tar.gz
firejail-56b86f8ace0962bc5e8f59a15c4ff423c80e4f9b.tar.zst
firejail-56b86f8ace0962bc5e8f59a15c4ff423c80e4f9b.zip
Revert "Makefile.in: stop running distclean on dist"
This reverts commit 1fb814e51149d105233f1edc1abb0de202f71b4d. If distclean is not executed before copying the files on dist, then the generated files inside src/ are included in the dist archive: $ ./configure >/dev/null && make distclean >/dev/null && ./configure >/dev/null && make dist | grep 'Makefile$' | wc -l 26 This happens because src/ is copied wholesale on dist (see DISTFILES). Revert the commit to ensure that only the input files (such as the "Makefile.in" files) are archived. Related discussion: https://github.com/netblue30/firejail/pull/5154#pullrequestreview-980810845 Relates to #5142.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 7d961213a..f788435c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -207,6 +207,11 @@ DISTFILES = "src etc m4 platform contrib configure configure.ac Makefile.in inst
207DISTFILES_TEST = "test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot" 207DISTFILES_TEST = "test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot"
208 208
209dist: 209dist:
210 mv config.status config.status.old
211 mv mkdeb.sh mkdeb.sh.old
212 make distclean
213 mv mkdeb.sh.old mkdeb.sh
214 mv config.status.old config.status
210 rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz 215 rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
211 mkdir -p $(NAME)-$(VERSION)/test 216 mkdir -p $(NAME)-$(VERSION)/test
212 cp -a "$(DISTFILES)" $(NAME)-$(VERSION) 217 cp -a "$(DISTFILES)" $(NAME)-$(VERSION)