Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/scripts/Makefile.build

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/scripts/Makefile.build (modified) (2 diffs)

branches/2.2.9/mindi-busybox/scripts/Makefile.build

@@ -14 +14 @@
 
 # The filename Kbuild has precedence over Makefile
+# bbox: we also try to include Kbuild file in obj tree first
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
-include $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, $(kbuild-dir)/Makefile)
+include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, \
+        $(if $(wildcard $(kbuild-dir)/Kbuild), $(kbuild-dir)/Kbuild, \
+            $(kbuild-dir)/Makefile \
+        ) \
+    )
 
 include scripts/Makefile.lib
@@ -252 +257 @@
 # If the list of objects to link is empty, just create an empty built-in.o
 cmd_link_o_target = $(if $(strip $(obj-y)),\
-              $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
-              rm -f $@; $(AR) rcs $@)
+        $(LD) $(ld_flags) -r -o $@ $(filter $(obj-y), $^),\
+        rm -f $@; $(AR) rcs $@)
 
 $(builtin-target): $(obj-y) FORCE