Revision: 2666
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2666
Author: robertmh
Date: 2009-10-26 20:04:43 +0000 (Mon, 26 Oct 2009)
Log Message:
-----------
2009-10-26 Robert Millan <[email protected]>
* autogen.sh: Support addition of external modules via `GRUB_CONTRIB'
variable.
* Makefile.in: Likewise.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/Makefile.in
trunk/grub2/autogen.sh
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-10-26 19:39:35 UTC (rev 2665)
+++ trunk/grub2/ChangeLog 2009-10-26 20:04:43 UTC (rev 2666)
@@ -1,5 +1,11 @@
2009-10-26 Robert Millan <[email protected]>
+ * autogen.sh: Support addition of external modules via `GRUB_CONTRIB'
+ variable.
+ * Makefile.in: Likewise.
+
+2009-10-26 Robert Millan <[email protected]>
+
* gendistlist.sh: Simplify .svn check. Skip .bzr as well.
2009-10-26 Robert Millan <[email protected]>
Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in 2009-10-26 19:39:35 UTC (rev 2665)
+++ trunk/grub2/Makefile.in 2009-10-26 20:04:43 UTC (rev 2666)
@@ -148,6 +148,9 @@
include $(srcdir)/conf/$(target_cpu)-$(platform).mk
+# For external modules.
+-include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
+
### General targets.
CLEANFILES += $(pkglib_DATA) $(pkgdata_DATA)
Modified: trunk/grub2/autogen.sh
===================================================================
--- trunk/grub2/autogen.sh 2009-10-26 19:39:35 UTC (rev 2665)
+++ trunk/grub2/autogen.sh 2009-10-26 20:04:43 UTC (rev 2666)
@@ -5,8 +5,10 @@
autoconf
autoheader
echo timestamp > stamp-h.in
-for rmk in conf/*.rmk; do
- ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
+for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
+ if test -e $rmk ; then
+ ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`
+ fi
done
./gendistlist.sh > DISTLIST
