X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fscripts%2Fversion_tag.pl.in;h=c3416425ea5f8c16f58e875df669cd71df70a32b;hb=0a9c9e444635dcf35a74bfb2f46efb3040ca17a0;hp=0e31be6f3dc14731dbaa3263d7d35abcbb6c4554;hpb=cbd3a230274e1197d378725ee9e2aed6e35d2cb6;p=fs%2Flustre-release.git

diff --git a/lustre/scripts/version_tag.pl.in b/lustre/scripts/version_tag.pl.in
index 0e31be6..c341642 100644
--- a/lustre/scripts/version_tag.pl.in
+++ b/lustre/scripts/version_tag.pl.in
@@ -16,9 +16,9 @@ sub get_tag()
     my $line;
 
     my $tagfile = new IO::File;
-    if (!$tagfile->open("CVS/Tag")) {
+    if (!$tagfile->open("lustre/CVS/Tag")) {
         my $verfile = new IO::File;
-        if (!$verfile->open("include/config.h")) {
+        if (!$verfile->open("config.h")) {
           return "UNKNOWN";
         }
         while(defined($line = <$verfile>)) {
@@ -156,7 +156,12 @@ sub generate_ver($$$)
                             $hour, $min, $sec);
 
     print "#define BUILD_VERSION \"";
-    if ($pristine) {
+
+    my $lustre_vers = $ENV{LUSTRE_VERS};
+
+    if ($lustre_vers) {
+        print "$tag-$lustre_vers\"\n";
+    } elsif ($pristine) {
         print "$tag-$show_last-PRISTINE-$linuxdir-$kernver\"\n";
     } else {
         print "$tag-$show_last-CHANGED-$linuxdir-$kernver\"\n";