Protect vgversion.h in a tarball from getting deleted by make clean

Create a file vgversion_dist.h in the tarball.
This file is not deleted by make clean
Change auxprogs/make_or_upd_vgversion_h to use vgversion_dist.h if it is
available.
Add some missing quotes to auxprogs/make_or_upd_vgversion_h

Patch by Matthias Schwarzott <zzam@gentoo.org>

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16398
This commit is contained in:
Mark Wielaard 2017-05-18 08:39:21 +00:00
parent 3387b8ba5f
commit 6d100a3d36
2 changed files with 10 additions and 5 deletions

View File

@ -117,7 +117,7 @@ EXTRA_DIST = \
autogen.sh
dist-hook: include/vgversion.h
cp -p include/vgversion.h $(distdir)/include/vgversion.h
cp -p include/vgversion.h $(distdir)/include/vgversion_dist.h
dist_noinst_SCRIPTS = \
vg-in-place

View File

@ -14,16 +14,21 @@ extract_svn_version()
fi
}
srcdir=${1:-.}
srcdir="${1:-.}"
cat > include/vgversion.h.tmp <<EOF
if [ -e "$srcdir"/include/vgversion_dist.h ]
then
cp "$srcdir"/include/vgversion_dist.h include/vgversion.h.tmp
else
cat > include/vgversion.h.tmp <<EOF
/* Do not edit: file generated by auxprogs/make_or_upd_vgversion_h.
This file defines VGSVN and VEXSVN, used to report SVN revision
when using command line options: -v --version
*/
#define VGSVN "$(extract_svn_version $srcdir/.)"
#define VEXSVN "$(extract_svn_version $srcdir/VEX)"
#define VGSVN "$(extract_svn_version "$srcdir/.")"
#define VEXSVN "$(extract_svn_version "$srcdir/VEX")"
EOF
fi
if [ -f include/vgversion.h ]
then