From c220f779c3ac2d3de2525461da65f89f21b7f467 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 29 Dec 2014 12:17:06 -0500
Subject: fix (mostly incorrect pluralization)

---
 Makefile.d/buildrom-withgrub.mk | 6 +++---
 Makefile.d/modules.mk           | 4 ++--
 Makefile.d/modules/coreboot.mk  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.d/buildrom-withgrub.mk b/Makefile.d/buildrom-withgrub.mk
index 11b223e..2a30217 100644
--- a/Makefile.d/buildrom-withgrub.mk
+++ b/Makefile.d/buildrom-withgrub.mk
@@ -27,12 +27,12 @@ roms/%(board)_%(keymap)_%(romtype).rom: \
 	cp $< $@.tmp
 	$(CBFSTOOL) $@.tmp add -f tmp/grub_%(keymap)_%(romtype).cfg -n grub.cfg -t raw
 	$(CBFSTOOL) $@.tmp add -f tmp/grub_%(keymap)_%(romtype)_test.cfg -n grubtest.cfg -t raw
+# Needed on i945 systems for the bucts/dd trick (documented)
+# This enables the ROM to be flashed over the lenovo bios firmware
 	$(if $(filter %(board),$(i945boards)),\
-		# Needed on i945 systems for the bucts/dd trick (documented)
-		# This enables the ROM to be flashed over the lenovo bios firmware
 		dd if='$@.tmp' of='$@.tmp.top64k' bs=1 skip=$$[$$(stat -c %s '$@.tmp') - 0x10000] count=64k && \
 		dd if='$@.tmp.top64k' of='$@.tmp' bs=1 seek=$$[$$(stat -c %s '$@.tmp') - 0x20000] count=64k conv=notrunc && \
 		rm -f '$@.tmp.top64k')
-	mv $@.tmp $@
+	mv -f $@.tmp $@
 endef
 $(eval $(call multiglob,rom,board keymap romtype))
diff --git a/Makefile.d/modules.mk b/Makefile.d/modules.mk
index cbd92ed..d08a55c 100644
--- a/Makefile.d/modules.mk
+++ b/Makefile.d/modules.mk
@@ -13,7 +13,7 @@ define rule_module_files
 src/%(arch)/%(module)/%: | tmp/builddeps-stamps/%(arch)/%(module)
 	test -e $@
 endef
-$(eval $(call multiglob,modules_files,arch module))
+$(eval $(call multiglob,module_files,arch module))
 
 # The generic rules
 
@@ -31,7 +31,7 @@ $(eval $(call multiglob,download,arch module))
 # % = arch/module
 tmp/builddeps-stamps/%: src/%
 	cd $< && { test -f ./Makefile || test -x ./configure || ./autogen.sh; }
-	cd $< && { test -f ./Makefile || ./configure $($*_configure); }
+	cd $< && { test -f ./Makefile || ./configure $($(*F)_configure); }
 	$(MAKE) -C $<
 	mkdir -p $(@D)
 	touch $@
diff --git a/Makefile.d/modules/coreboot.mk b/Makefile.d/modules/coreboot.mk
index 1cf2309..1099039 100644
--- a/Makefile.d/modules/coreboot.mk
+++ b/Makefile.d/modules/coreboot.mk
@@ -29,7 +29,7 @@ define rule_coreboot_utils
 src/%(arch)/coreboot/util/%(coreboot_util): | src/%(arch)/coreboot
 	test -d $@
 endef
-$(eval $(call multiglob,coreboot_utils,arch coreboot_utils))
+$(eval $(call multiglob,coreboot_utils,arch coreboot_util))
 
 # The builddeps stamp needs to depend on 3 "utility" builddeps
 $(foreach arch,$(arches),tmp/builddeps-stamps/$(arch)/coreboot): \
-- 
cgit v1.2.3-54-g00ecf