* grub-core/genmoddep.awk: Use more portable && rather than and.

diff --git a/ChangeLog b/ChangeLog
index 5dc085447b5690286d75dab8c73ebf0e3a024173..6b094216a0129300eb58247b81e7b13e597bebfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-25  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/genmoddep.awk: Use more portable && rather than and.
+
 2013-11-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/i386/pc/startup.S [__APPLE__]: Create _edata by placing

diff --git a/grub-core/genmoddep.awk b/grub-core/genmoddep.awk
index dc555b93ccb7f7f12cda40395047c3573dfc3cd3..2e6af05a7ce46ef55fcaea78c662c8c180d937fd 100644 (file)
--- a/grub-core/genmoddep.awk
+++ b/grub-core/genmoddep.awk
@@ -23,7 +23,7 @@ BEGIN {
     } else if ($1 == "undefined") {
       if ($3 in symtab)
        modtab[$2] = modtab[$2] " " symtab[$3];
-      else if (and ($3 != "__gnu_local_gp", $3 != "_gp_disp")) {
+      else if ($3 != "__gnu_local_gp" && $3 != "_gp_disp") {
        printf "%s in %s is not defined\n", $3, $2 >"/dev/stderr";
        error++;
       }