[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    Re: [PATCH] scripts/Makefile.clean: Make Kbuild and Makefile optional
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2010-05-16 0:50:34
Message-ID: 201005160250.34614.vda.linux () googlemail ! com
[Download RAW message or body]

On Friday 14 May 2010 01:46, Peter Tyser wrote:
> 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 <ptyser@xes-inc.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
>  # ==========================================================================

Applied, thanks!
-- 
vda
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]