2008-05-29 Robert Millan <rmh@aybabtu.com>

        * util/powerpc/ieee1275/grub-install.in: Move from here ...
        * util/ieee1275/grub-install.in: ... to here.
        * powerpc-ieee1275.rmk (grub_install_SOURCES): Update location.
        * i386-ieee1275.rmk (sbin_SCRIPTS): New variable.
        (grub_install_SOURCES): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 4e9bd21aa2fede5ecb08919e20c4fd948f244742..dcbf025ab074fece8098a78615b35434701addbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-29  Robert Millan  <rmh@aybabtu.com>
+
+       * util/powerpc/ieee1275/grub-install.in: Move from here ...
+       * util/ieee1275/grub-install.in: ... to here.
+       * powerpc-ieee1275.rmk (grub_install_SOURCES): Update location.
+       * i386-ieee1275.rmk (sbin_SCRIPTS): New variable.
+       (grub_install_SOURCES): Likewise.
+
 2008-05-29  Robert Millan  <rmh@aybabtu.com>
 
        * fs/affs.c: Update copyright year.

diff --git a/DISTLIST b/DISTLIST
index b2f5f832b202d8e1ae167b67d365bd63050a2f0d..7b9598cde4901a74981d8b7818a4f9165988c6f1 100644 (file)
--- a/DISTLIST
+++ b/DISTLIST
@@ -341,9 +341,9 @@ util/i386/pc/grub-mkrescue.in
 util/i386/pc/grub-setup.c
 util/i386/pc/misc.c
 util/ieee1275/get_disk_name.c
+util/ieee1275/grub-install.in
 util/lvm.c
 util/misc.c
-util/powerpc/ieee1275/grub-install.in
 util/powerpc/ieee1275/grub-mkrescue.in
 util/powerpc/ieee1275/misc.c
 util/raid.c

diff --git a/conf/i386-ieee1275.mk b/conf/i386-ieee1275.mk
index eb0334c2a1b45f26ee05580278f1a5839fd88bfe..9cb46947f595a7b03a542738ca754aa8b29e886f 100644 (file)
--- a/conf/i386-ieee1275.mk
+++ b/conf/i386-ieee1275.mk
@@ -571,6 +571,18 @@ grub_emu-grub_emu_init.o: grub_emu_init.c $(grub_emu_init.c_DEPENDENCIES)
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
+# Scripts.
+sbin_SCRIPTS = grub-install
+
+# For grub-install.
+grub_install_SOURCES = util/ieee1275/grub-install.in
+CLEANFILES += grub-install
+
+grub-install: util/ieee1275/grub-install.in $(util/ieee1275/grub-install.in_DEPENDENCIES) config.status
+       ./config.status --file=grub-install:util/ieee1275/grub-install.in
+       chmod +x $@
+
+
 # Modules.
 pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod cpuid.mod  \
        multiboot.mod _multiboot.mod aout.mod serial.mod linux.mod      \

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 0c62aeaf5c38a7aba2c00ec51387146a672d7058..17f035f02d7090bbccc3d0f443f8f2012d384ea1 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -95,6 +95,12 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c     \
 
 grub_emu_LDFLAGS = $(LIBCURSES)
 
+# Scripts.
+sbin_SCRIPTS = grub-install
+
+# For grub-install.
+grub_install_SOURCES = util/ieee1275/grub-install.in
+
 # Modules.
 pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod cpuid.mod  \
        multiboot.mod _multiboot.mod aout.mod serial.mod linux.mod      \

diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index a44b7acccc072527e3848e52930fe2d4ad4ffd41..32f2a0b293e3c6052762530e1514918151f17071 100644 (file)
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -555,11 +555,11 @@ sbin_SCRIPTS = grub-install
 bin_SCRIPTS = grub-mkrescue
 
 # For grub-install.
-grub_install_SOURCES = util/powerpc/ieee1275/grub-install.in
+grub_install_SOURCES = util/ieee1275/grub-install.in
 CLEANFILES += grub-install
 
-grub-install: util/powerpc/ieee1275/grub-install.in $(util/powerpc/ieee1275/grub-install.in_DEPENDENCIES) config.status
-       ./config.status --file=grub-install:util/powerpc/ieee1275/grub-install.in
+grub-install: util/ieee1275/grub-install.in $(util/ieee1275/grub-install.in_DEPENDENCIES) config.status
+       ./config.status --file=grub-install:util/ieee1275/grub-install.in
        chmod +x $@
 
 

diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index b5ab18625c5837dda80e8f5f26b0685101f2ffd1..deab80b418ed5d9f05fcc1f370bc1ef233f53252 100644 (file)
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -99,7 +99,7 @@ sbin_SCRIPTS = grub-install
 bin_SCRIPTS = grub-mkrescue
 
 # For grub-install.
-grub_install_SOURCES = util/powerpc/ieee1275/grub-install.in
+grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # For grub-mkrescue.
 grub_mkrescue_SOURCES = util/powerpc/ieee1275/grub-mkrescue.in

diff --git a/util/powerpc/ieee1275/grub-install.in b/util/ieee1275/grub-install.in
similarity index 100%
rename from util/powerpc/ieee1275/grub-install.in
rename to util/ieee1275/grub-install.in