From d63e0d041e54da63060f1c067f3a9e6902a079de Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Sun, 8 Jun 2008 23:05:24 +0000 Subject: [PATCH] Changes Makefile generation so that recursive "make" calls read "$(MAKE)" instead, as GNU make (or "gmake") is currently necessary to build. Signed-off-by: Pierre Pronchery Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3363 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- util/ADLO/Makefile | 4 ++-- util/newconfig/config.g | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util/ADLO/Makefile b/util/ADLO/Makefile index 1533cf5601..6af8c7409e 100644 --- a/util/ADLO/Makefile +++ b/util/ADLO/Makefile @@ -40,7 +40,7 @@ loader.o: loader.s #------------------------------------------------- bios: - ( cd ${BOCHS_B} ; make ) + ( cd ${BOCHS_B} ; $(MAKE) ) sync #------------------------------------------------- @@ -101,7 +101,7 @@ install: clean: rm -rf *.o ${PAYLOAD} - (cd ${BOCHS_B} ; make clean ) + (cd ${BOCHS_B} ; $(MAKE) clean ) distclean: clean rm -rf ${BOCHS_C} diff --git a/util/newconfig/config.g b/util/newconfig/config.g index d8570c7bc6..a8b2ed2b51 100644 --- a/util/newconfig/config.g +++ b/util/newconfig/config.g @@ -2158,7 +2158,7 @@ def writemakefile(path): for i, o in romimages.items(): file.write("%s/coreboot.rom:\n" % o.getname()) file.write("\tif (cd %s; \\\n" % o.getname()) - file.write("\t\tmake coreboot.rom)\\\n") + file.write("\t\t$(MAKE) coreboot.rom)\\\n") file.write("\tthen true; else exit 1; fi;\n\n") file.write("clean: ") for i in romimages.keys(): @@ -2166,7 +2166,7 @@ def writemakefile(path): file.write("\n\n") for i, o in romimages.items(): file.write("%s-clean:\n" % o.getname()) - file.write("\t(cd %s; make clean)\n\n" % o.getname()) + file.write("\t(cd %s; $(MAKE) clean)\n\n" % o.getname()) for i in buildroms: file.write("%s:" % i.name)