From: Peter Tyser Date: Thu, 13 May 2010 23:46:00 +0000 (-0500) Subject: scripts/Makefile.clean: Make Kbuild and Makefile optional X-Git-Tag: 1_17_0~227 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=748139332ad632001935b0535764cdbd1c71ce26;p=oweals%2Fbusybox.git scripts/Makefile.clean: Make Kbuild and Makefile optional During cleaning, some directories might not have a Makefile or Kbuild file. Previously scripts/Makefile.clean would spit out the following error when neither file could be found: ptyser@petert busybox $ make mrproper scripts/Makefile.clean:17: /home/user/busybox/findutils/Makefile: No such file or directory make[1]: *** No rule to make target `/home/user/busybox/findutils/Makefile'. Stop. make: *** [_clean_findutils] Error 2 This issue can be triggered by running 'make mrproper' in a freshly cloned busybox repository. Signed-off-by: Peter Tyser Signed-off-by: Denys Vlasenko --- diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index cff33498f..03e397f42 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean @@ -14,7 +14,7 @@ clean := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.clean obj # The filename Kbuild has precedence over Makefile kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) -include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile) +-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile) # Figure out what we need to build from the various variables # ==========================================================================