[git commit master] scripts/Makefile.clean: Make Kbuild and Makefile optional

Denys Vlasenko vda.linux at googlemail.com
Sun May 16 00:50:07 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=748139332ad632001935b0535764cdbd1c71ce26
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

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 at 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 <ptyser at xes-inc.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 scripts/Makefile.clean |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index cff3349..03e397f 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
 # ==========================================================================
-- 
1.6.3.3



More information about the busybox-cvs mailing list