From ace53ca9a25530366f38e84ee051e7ca0c9c9d6f Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Mon, 5 Oct 2009 19:08:03 -0500 Subject: [svn-r17592] Bug fix: Release would leave behind an Makefile even if it did not exist before. Fixed by restoring only the pre-existed Makefile. Tested: Jam. --- bin/release | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/release b/bin/release index b41c5d4..c335028 100755 --- a/bin/release +++ b/bin/release @@ -196,7 +196,8 @@ grep '^\.' MANIFEST | grep -v _DO_NOT_DISTRIBUTE_ >$MANIFEST # Prepare the source tree for a release. ln -s `pwd` $tmpdir/$HDF5_VERS || exit 1 -mv Makefile $tmpdir/Makefile.x 2>/dev/null #might fail +# Save a backup copy of Makefile if exists. +test -f Makefile && mv Makefile $tmpdir/Makefile.x cp -p Makefile.dist Makefile # Update README.txt and release_docs/RELEASE.txt with release information in @@ -259,7 +260,8 @@ done # Copy the RELEASE.txt to the release area. cp release_docs/RELEASE.txt $DEST/$HDF5_VERS-RELEASE.txt -# Restore previous Makefile if existed. +# Remove distributed Makefile and restore previous Makefile if existed. +rm -f Makefile test -f $tmpdir/Makefile.x && mv $tmpdir/Makefile.x Makefile # Restore OLD version information, then no need for trap. -- cgit v0.12