[svn-r26350] Merge of r26273-26348 from the trunk.

Tested on: h5committest

1 files changed, 3 insertions, 11 deletions

diff --git a/bin/h5vers b/bin/h5vers
index 475ff5a..cb4b9e0 100755
--- a/bin/h5vers
+++ b/bin/h5vers
@@ -159,10 +159,10 @@ while ($_ = shift) {
 die "mutually exclusive options given\n" if $set && $inc;
 
 # Determine file to use as H5public.h, README.txt,
-# release_docs/RELEASE.txt, configure.ac, windows/src/H5pubconf.h,
-# vms/src/h5pubconf.h and config/lt_vers.am. 
+# release_docs/RELEASE.txt, configure.ac, windows/src/H5pubconf.h
+# and config/lt_vers.am. 
 # The README.txt, release_docs/RELEASE.txt, configure.ac, 
-# vms/src/h5pubconf.h, windows/src/H5pubconf.h, and config/lt_vers.am 
+# windows/src/H5pubconf.h, and config/lt_vers.am 
 # files are always in the directory above H5public.h
 unless ($file) {
   for (@files) {
@@ -187,10 +187,6 @@ die "unable to read file: $RELEASE\n" unless -r $file;
 my $CONFIGURE = $file;
 $CONFIGURE =~ s/[^\/]*$/..\/configure.ac/;
 die "unable to read file: $CONFIGURE\n" unless -r $file;
-# vms/src/h5pubconf.h
-my $H5VMSPUBCONF = $file;
-$H5VMSPUBCONF =~ s/[^\/]*$/..\/vms\/src\/h5pubconf.h/;
-die "unable to read file: $H5VMSPUBCONF\n" unless -r $file;
 
 # Get the current version number.
 open FILE, $file or die "unable to open $file: $!\n";
@@ -238,7 +234,6 @@ if ($set) {
   $README = "";
   $RELEASE = "";
   $CONFIGURE = "";
-  $H5VMSPUBCONF = "";
   $LT_VERS = "";
   @newver = @curver;
 }
@@ -387,9 +382,6 @@ sub gen_h5pubconf {
     close FILE;
 }
 
-# Update the VMS-maintained h5pubconf.h file
-gen_h5pubconf("HDF5", $H5VMSPUBCONF, @newver) if $H5VMSPUBCONF;
-    
 # Print the new version number
 if ($verbose) {
   printf("version %d.%d release %d%s\n", @newver[0,1,2],