From 1a211881d5d615abe41ec5521eb3965e449abaf3 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 1 Dec 2005 21:01:15 +0000 Subject: [PATCH] Arrgh -- forgot to save some comment changes and remove some debugging before committing. This commit was SVN r8368. --- contrib/dist/make_dist_tarball | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/contrib/dist/make_dist_tarball b/contrib/dist/make_dist_tarball index 71cfdebddc..2ce9936ac4 100755 --- a/contrib/dist/make_dist_tarball +++ b/contrib/dist/make_dist_tarball @@ -99,8 +99,7 @@ make_tarball() { echo "*** Running make distcheck..." save_LD=$LD_LIBRARY_PATH LD_LIBRARY_PATH= - make dist 2>&1 | tee dist.out -# JMS RESTORE MAKE DISTCHECK + make distcheck 2>&1 | tee dist.out if test ! "$?" = "0"; then echo "Make dist failed. Aborting" exit 1 @@ -131,7 +130,7 @@ check_gnu_version autoconf $AC_TARGET_VERSION check_gnu_version libtool $LT_TARGET_VERSION # -# Verify that we're in a top trillium dir +# Verify that we're in a top Open MPI dir # echo "*** Checking to ensure in top-level Open MPI directory..." if test -f VERSION -a -f configure.ac -a -f config/ompi_setup_cc.m4; then @@ -176,8 +175,12 @@ done # # unless the user specifically said --greekonly, then only make the # greek tarball. Making both tarballs at once allows us to guarantee -# to have 1 tarballs -- one greek and one not -- that have exactly the -# same SVN r number. +# to have two tarballs -- one greek and one not -- that have exactly +# the same SVN r number (as opposed to, for example, running this +# script to make a greek tarball, then running it again to make a +# non-greek tarball -- there is a race condition that someone could +# commit in the meantime and change the SVN r number in the 2nd +# tarball) # # First, make greek tarball