b=19721

i=brian
o=adilger

Workaround in version_tag.pl for some (Debian?) systems where, for whatever
reason, MODULES_{TRUE|FALSE} does not get included in the {auto,}Makefile.in
files

diff --git a/lustre/scripts/version_tag.pl b/lustre/scripts/version_tag.pl
index 31978cf..92655e1 100644 (file)
--- a/lustre/scripts/version_tag.pl
+++ b/lustre/scripts/version_tag.pl
@@ -154,11 +154,10 @@ sub get_linuxdir()
             $dir = $1;
         } elsif ($line =~ /LINUX_OBJ :?= (.*)/) {
             $objdir = $1;
-        } elsif ($line =~ /MODULES_TRUE :?= (.*)/) {
+        } elsif ($line =~ /MODULES_TRUE = #/ ||
+                $line =~ /MODULE_TARGET = $/) {
             # nothing to do if modules are not being built
             return ""
-                if ($1 eq "#");
-            last;
         }
     }
     $config->close();
@@ -167,7 +166,7 @@ sub get_linuxdir()
         !$ver->open("$objdir/include/linux/version.h") &&
         !$ver->open("$dir/include/linux/utsrelease.h") &&
         !$ver->open("$dir/include/linux/version.h")) {
-            die "Run make dep on $dir\n";
+            die "Run make dep on '$dir'\n";
         }
 
     while(defined($line = <$ver>)) {