Răsfoiți Sursa

kbuild: scripts/mkmakefile: dynamic determination of output directory

Rather than fixing the output directory in the generated Makefile,
determine it from the placement of Makefile. This allows moving
the build tree around or accessing it through different mount paths.

(The lastword definition is a compatibility one for make prior to 3.81;
newer make will simply ignore it and use the [faster] built-in.)

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Jan Beulich 17 ani în urmă
părinte
comite
1d3b3bfab1
1 a modificat fișierele cu 7 adăugiri și 3 ștergeri
  1. 7 3
      scripts/mkmakefile

+ 7 - 3
scripts/mkmakefile

@@ -25,8 +25,11 @@ cat << EOF > $2/Makefile
 VERSION = $3
 VERSION = $3
 PATCHLEVEL = $4
 PATCHLEVEL = $4
 
 
-KERNELSRC    := $1
-KERNELOUTPUT := $2
+lastword = \$(word \$(words \$(1)),\$(1))
+makedir := \$(dir \$(call lastword,\$(MAKEFILE_LIST)))
+
+MAKEARGS := -C $1
+MAKEARGS += O=\$(if \$(patsubst /%,,\$(makedir)),\$(CURDIR)/)\$(patsubst %/,%,\$(makedir))
 
 
 MAKEFLAGS += --no-print-directory
 MAKEFLAGS += --no-print-directory
 
 
@@ -35,10 +38,11 @@ MAKEFLAGS += --no-print-directory
 all	:= \$(filter-out all Makefile,\$(MAKECMDGOALS))
 all	:= \$(filter-out all Makefile,\$(MAKECMDGOALS))
 
 
 all:
 all:
-	\$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$(all)
+	\$(MAKE) \$(MAKEARGS) \$(all)
 
 
 Makefile:;
 Makefile:;
 
 
 \$(all) %/: all
 \$(all) %/: all
 	@:
 	@:
+
 EOF
 EOF