Author: stepan
Date: 2008-06-09 01:05:24 +0200 (Mon, 09 Jun 2008)
New Revision: 3363
Modified:
trunk/coreboot-v2/util/ADLO/Makefile
trunk/coreboot-v2/util/newconfig/config.g
Log:
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 <khorben(a)defora.org>
Acked-by: Stefan Reinauer <stepan(a)coresystems.de>
Modified: trunk/coreboot-v2/util/ADLO/Makefile
===================================================================
--- trunk/coreboot-v2/util/ADLO/Makefile 2008-06-07 12:35:11 UTC (rev 3362)
+++ trunk/coreboot-v2/util/ADLO/Makefile 2008-06-08 23:05:24 UTC (rev 3363)
@@ -40,7 +40,7 @@
#-------------------------------------------------
bios:
- ( cd ${BOCHS_B} ; make )
+ ( cd ${BOCHS_B} ; $(MAKE) )
sync
#-------------------------------------------------
@@ -101,7 +101,7 @@
clean:
rm -rf *.o ${PAYLOAD}
- (cd ${BOCHS_B} ; make clean )
+ (cd ${BOCHS_B} ; $(MAKE) clean )
distclean: clean
rm -rf ${BOCHS_C}
Modified: trunk/coreboot-v2/util/newconfig/config.g
===================================================================
--- trunk/coreboot-v2/util/newconfig/config.g 2008-06-07 12:35:11 UTC (rev 3362)
+++ trunk/coreboot-v2/util/newconfig/config.g 2008-06-08 23:05:24 UTC (rev 3363)
@@ -2158,7 +2158,7 @@
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 @@
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)