Don’t use literal result elements in transforms

[Shushe] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 3161ecd5960c3243b0a2c30c01950cf148ca1ccb..563426489af0e78109b07d1b5316cdd18e8f1f56 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -275,7 +275,7 @@ export LC_ALL
 
 # Posix timezone information.
 TZ := UTC0
-export UTC0
+export TZ
 
 # The default target for this makefile.
 .DEFAULT_GOAL := all
@@ -575,7 +575,7 @@ listout :
 
 # Destroy installed files.
 uninstall :
-       $(foreach file,$(installablefiles),$(if $(wildcard $(call installed,$(file))),$(silent)$(PRINTF) '%s\n' $(call quote,Removing </$(patsubst $(DESTDIR)/%,%,$(call installed,$(file)))>…)$(newline)$(silent)$(RM) -f $(call quote,$(call installed,$(file)))$(newline),))
+       $(foreach file,$(installablefiles),$(if $(wildcard $(call installed,$(file))),$(silent)$(PRINTF) '%s\n' $(call quote,Removing </$(patsubst $(DESTDIR)/%,%,$(call installed,$(file)))>…)$(newline)$(silent)$(RM) -f -R $(call quote,$(call installed,$(file)))$(newline),))
 
 # Raise an error when attempting to build any files with recursive dependencies.
 $(call built,$(recursivefiles)) :
@@ -807,7 +807,7 @@ clean :
 ifneq ($(twostep),)
 # Build the data and remove outdated data files.
 data : $(BUILDDIR)/data.out
-       $(silent)$(FIND) $(call quote,$(BUILDDIR)/data/public) '!' -exec $(GREP) -F -q -x '{}' $(call quote,$<) ';' -a '(' -type d -o -print ')' | $(xargsmultiquote) | $(XARGS) -E '' $(RM)
+       $(silent)$(FIND) $(call quote,$(BUILDDIR)/data/public) '!' '(' -exec $(GREP) -F -q -x '{}' $(call quote,$<) ';' -a -prune ')' -a '(' -type d -o -print ')' | $(xargsmultiquote) | $(XARGS) -E '' $(RM)
 endif
 
 # Provide help.