2009-11-24 Felix Zielcke <fzielcke@z-51.de>

	* Makefile.in: Don't include GRUB_CONTRIB makefiles with emu
	platform.

diff --git a/ChangeLog b/ChangeLog
index 8bf408f243a8d4df717ef9d5d55c4b2bd80a5293..186ce7184081ec4e49bd72ea68584ad268c2372c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-24  Felix Zielcke  <fzielcke@z-51.de>
+
+       * Makefile.in: Don't include GRUB_CONTRIB makefiles with emu
+       platform.
+
 2009-11-24  Felix Zielcke  <fzielcke@z-51.de>
 
        * util/getroot.c (grub_util_get_dev_abstraction): Properly use

diff --git a/Makefile.in b/Makefile.in
index adab7ec0af32a3aec06d3a50df7f17c8d6e2fcb1..6d367526cad1759af501d27afed8dbfd0cfba3b9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -156,10 +156,9 @@ ifeq ($(platform), emu)
 include $(srcdir)/conf/any-emu.mk
 else
 include $(srcdir)/conf/$(target_cpu)-$(platform).mk
-endif
-
 # For external modules.
 -include $(wildcard $(GRUB_CONTRIB)/*/conf/common.mk)
+endif
 
 ### General targets.