[2251] 2009-06-04 Vladimir Serbinenko <[email protected]>

Revision: 2251
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2251
Author:   phcoder
Date:     2009-06-04 19:39:51 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
2009-06-04  Vladimir Serbinenko  <[email protected]>

	Simplify sed expressions and improve awk

	* Makefile.in (install-local): simplify sed expression
	* gencmdlist.sh: likewise
	* genmoddep.awk: avoid adding module as a dependency of itself

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/Makefile.in
    trunk/grub2/gencmdlist.sh
    trunk/grub2/genmoddep.awk

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog	2009-06-04 19:35:31 UTC (rev 2250)
+++ trunk/grub2/ChangeLog	2009-06-04 19:39:51 UTC (rev 2251)
@@ -1,9 +1,17 @@
 2009-06-04  Vladimir Serbinenko  <[email protected]>
 
+	Simplify sed expressions and improve awk
+
+	* Makefile.in (install-local): simplify sed expression
+	* gencmdlist.sh: likewise
+	* genmoddep.awk: avoid adding module as a dependency of itself
+
+2009-06-04  Vladimir Serbinenko  <[email protected]>
+
 	Add missing start symbols
 
 	* boot/i386/pc/boot.S: add start
-	boot/i386/pc/pxeboot.S: likewise
+	* boot/i386/pc/pxeboot.S: likewise
 	
 2009-06-04  Vladimir Serbinenko  <[email protected]>
 

Modified: trunk/grub2/Makefile.in
===================================================================
--- trunk/grub2/Makefile.in	2009-06-04 19:35:31 UTC (rev 2250)
+++ trunk/grub2/Makefile.in	2009-06-04 19:39:51 UTC (rev 2251)
@@ -213,7 +213,7 @@
 	for file in $$list; do \
 	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
 	  dest="`echo $$file | sed 's,include/,,'`"; \
-	  destdir="`echo $$dest | sed 's,\(^\|/\)[^/]*$$,,g'`"; \
+	  destdir="`echo $$dest | sed 's,[^/]*$$,,g'`"; \
 	  $(mkinstalldirs) $(DESTDIR)$(includedir)/$$destdir; \
 	  if test -f "$$dir$$file"; then \
 	    $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(includedir)/$$dest; \

Modified: trunk/grub2/gencmdlist.sh
===================================================================
--- trunk/grub2/gencmdlist.sh	2009-06-04 19:35:31 UTC (rev 2250)
+++ trunk/grub2/gencmdlist.sh	2009-06-04 19:39:51 UTC (rev 2251)
@@ -17,4 +17,6 @@
 
 grep -v "^#" | sed -n \
  -e "/grub_register_command *( *\"/{s/.*( *\"\([^\"]*\)\".*/\1: $module/;p;}" \
- -e "/\(grub_register_extcmd\|grub_register_command_p1\) *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $module/;p;}"
+ -e "/grub_register_extcmd *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $module/;p;}" \
+ -e "/grub_register_command_p1 *( *\"/{s/.*( *\"\([^\"]*\)\".*/*\1: $module/;p;}"
+

Modified: trunk/grub2/genmoddep.awk
===================================================================
--- trunk/grub2/genmoddep.awk	2009-06-04 19:35:31 UTC (rev 2250)
+++ trunk/grub2/genmoddep.awk	2009-06-04 19:39:51 UTC (rev 2251)
@@ -50,7 +50,7 @@
     for (i in depmods) {
       depmod = depmods[i];
       # Ignore kernel, as always loaded.
-      if (depmod != "kernel")
+      if (depmod != "kernel" && depmod != mod)
 	uniqmods[depmod] = 1;
     }
     modlist = ""