From: Felix Zielcke <fzielcke@z-51.de>
Date: Tue, 24 Nov 2009 11:29:17 +0000 (+0100)
Subject: 2009-11-24  Felix Zielcke  <fzielcke@z-51.de>
X-Git-Tag: 1.98~371
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11d9778b86494b4a44ca55c578d7e94c5fc4897f;p=thirdparty%2Fgrub.git

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 8bf408f24..186ce7184 100644
--- 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 adab7ec0a..6d367526c 100644
--- 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.