clean.mk: allow to forbid cleanup explicitly

The behaviour that sort of settled didn't actually follow the principle of the least surprise when one really wanted to have BUILDDIR available for inspection; DEBUG=2 would be effective to achieve that but CLEAN=0 would not. Thanks led@ for spotting and reporting this.

clean.mk: allow to forbid cleanup explicitly
674f7db2 · Michael Shigorin · 891f982e · 674f7db2 · 674f7db2
Commit 674f7db2 authored Aug 13, 2013 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

params.txt doc/params.txt +1 -1

clean.mk lib/clean.mk +7 -3

No files found.
--- a/doc/params.txt
+++ b/doc/params.txt
@@ -47,7 +47,7 @@
 ** экономия RAM+swap при сборке в tmpfs, иначе места на диске
 ** очистка рабочего каталога после успешной сборки очередной стадии
 ** может помешать использовать некоторые варианты отладки
-** значение: любая строка; по умолчанию пусто при DEBUG, иначе 1
+** значение: пусто, 0, 1, 2; по умолчанию пусто при DEBUG, иначе 1
 ** см. ../lib/clean.mk

 * DEBUG

--- a/lib/clean.mk
+++ b/lib/clean.mk
@@ -53,10 +53,14 @@ distclean: clean
 # than BUILDDIR variable is -- usually it's unneeded afterwards
 postclean: build-image
 	@{ \
-	if [ "0$(DEBUG)" -lt 2 -a -z "$(CHECK)$(REPORT)" ] && \
-	     [ "$(NUM_TARGETS)" -gt 1 \
+	if [ "$(CLEAN)" != 0 ] && \
+	   [ "0$(DEBUG)" -lt 2 ] && \
+	   [ -z "$(CHECK)" ] && \
+	   [ -z "$(REPORT)" ] && \
+	   [ "$(NUM_TARGETS)" -gt 1 \
 	       -o -n "$(__frontend)" \
-	       -o ! -L "$(SYMLINK)" ]; then \
+	       -o ! -L "$(SYMLINK)" ]; \
+	then \
 		echo "$(TIME) cleaning up after build"; \
 		$(MAKE) -C "$(BUILDDIR)" distclean \
 			GLOBAL_BUILDDIR="$(BUILDDIR)" $(LOG) ||:; \