From: eeb <eeb>
Date: Tue, 30 Sep 2003 09:26:12 +0000 (+0000)
Subject: *  Merged HEAD diffs
X-Git-Tag: v1_7_100~1^71~26
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d04496de2626c38f384c9ec40a40c3343af11670;p=fs%2Flustre-release.git

*  Merged HEAD diffs
---

diff --git a/lustre/scripts/version_tag.pl b/lustre/scripts/version_tag.pl
index f33443f..334d2d6 100644
--- a/lustre/scripts/version_tag.pl
+++ b/lustre/scripts/version_tag.pl
@@ -9,13 +9,27 @@ use Time::Local;
 my $pristine = 1;
 my $kernver;
 
+# Use the CVS tag first otherwise use the portals version
 sub get_tag()
 {
     my $tag;
+    my $line;
 
     my $tagfile = new IO::File;
     if (!$tagfile->open("CVS/Tag")) {
-        return "HEAD";
+        my $verfile = new IO::File;
+        if (!$verfile->open("portals/include/config.h")) {
+          return "UNKNOWN";
+        }
+        while(defined($line = <$verfile>)) {
+            $line =~ /\#define VERSION "(.*)"/;
+            if ($1) {
+                $tag = $1;
+                last;
+            }
+        }
+        $verfile->close();
+        return $tag
     } else {
         my $tmp = <$tagfile>;
         $tagfile->close();