* grub-core/Makefile.am (command.lst): Adjust sed expression

ordering so that extended and priority commands aren't treated as
ordinary commands.

diff --git a/ChangeLog b/ChangeLog
index 815004080f9c546aeaabc5bdcc5d8b9380ff8114..4a09faca4f0a23cbb9b442555c89804d5fd3a96e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/Makefile.am (command.lst): Adjust sed expression
+       ordering so that extended and priority commands aren't treated as
+       ordinary commands.
+
 2010-11-23  Colin Watson  <cjwatson@ubuntu.com>
 
        * include/grub/gpt_partition.h (GRUB_GPT_PARTITION_TYPE_BIOS_BOOT):

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
index 9792dd97400e2171d6424170ba5985a93ff72d6c..131fa5fd760a50f256d1b7c0da8027dbb6a1c16a 100644 (file)
--- a/grub-core/Makefile.am
+++ b/grub-core/Makefile.am
@@ -237,9 +237,9 @@ command.lst: $(MARKER_FILES)
        (for pp in $^; do \
          b=`basename $$pp .marker`; \
          sed -n \
-           -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" \
            -e "/EXTCOMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
-           -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" $$pp; \
+           -e "/P1COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $$b/;p;}" \
+           -e "/COMMAND_LIST_MARKER *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $$b/;p;}" $$pp; \
        done) | sort -u > $@
 platform_DATA += command.lst
 CLEANFILES += command.lst