- my ($file, $line, $macro, $package, $version, @rest) = split (':', $trace);
- print "\tVERSION=$version\n";
-
- # Append -g012345 to AC_INIT version number.
- my $fullname = "$builddir/pspp$buildnumber/$file";
+ my ($file, $line, $macro, $package, $repo_version, @rest)
+ = split (':', $trace);
+ set_var ("repo_version", $repo_version);
+
+ # Is this a "gnits" mode tree?
+ start_step ("Checking Automake mode");
+ open (MAKEFILE_AM, '<', "$builddir/pspp$build_number/Makefile.am");
+ my $am_mode = "gnu";
+ while (<MAKEFILE_AM>) {
+ if (/gnits/) {
+ $am_mode = "gnits";
+ last;
+ }
+ }
+ close (MAKEFILE_AM);
+ set_var ("am_mode", $am_mode);
+
+ # Generate version number for build.
+ # We want to append -g012345, but if we're in Gnits mode and the
+ # version number already has a hyphen, we have to omit it.
+ start_step ("Generate build version number");
+ my $version = $repo_version;
+ $version .= '-' unless $version =~ /-/;
+ $version .= "g$abbrev_commit";
+ set_var ("version", $version);
+
+ # Append -g012345 to configure.ac version number.
+ start_step ("Updating version number in $file");
+ my $fullname = "$builddir/pspp$build_number/$file";