2009-12-08 Robert Millan <rmh.grub@aybabtu.com>

        * conf/common.rmk [sparc64-ieee1275] (grub_mkdevicemap_SOURCES): Use
        `util/ieee1275/ofpath.c' and `util/ieee1275/devicemap.c' instead of
        `util/devicemap.c'.

diff --git a/ChangeLog b/ChangeLog
index dc475c96cf165d25315aab8aee700a07d03b6e68..2c5df8421374e5a849944ba91205f5f6cb221bfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-08  Robert Millan  <rmh.grub@aybabtu.com>
+
+       * conf/common.rmk [sparc64-ieee1275] (grub_mkdevicemap_SOURCES): Use
+       `util/ieee1275/ofpath.c' and `util/ieee1275/devicemap.c' instead of
+       `util/devicemap.c'.
+
 2009-12-08  Carles Pina i Estany  <carles@pina.cat>
 
        * include/grub/misc.h (grub_printf_): New declaration.

diff --git a/conf/common.rmk b/conf/common.rmk
index 8967055266171cdff0f44617ad92114a1aee5836..56f17e4e7cdc298f650eef12eea6a53e5a34db8a 100644 (file)
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -3,7 +3,13 @@
 sbin_UTILITIES += grub-mkdevicemap
 grub_mkdevicemap_SOURCES = gnulib/progname.c util/grub-mkdevicemap.c \
        util/deviceiter.c \
-       util/devicemap.c util/misc.c
+       util/misc.c
+
+ifeq ($(target_cpu)-$(platform), sparc64-ieee1275)
+grub_mkdevicemap_SOURCES += util/ieee1275/ofpath.c util/ieee1275/devicemap.c
+else
+grub_mkdevicemap_SOURCES += util/devicemap.c
+endif
 
 # For grub-mkelfimage.
 bin_UTILITIES += grub-mkelfimage