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

diff --git a/Makefile.am b/Makefile.am
index ea87cc1870b667a4ff75add5e1beb3ac49b43f3a..fdce3cf9fda82ff505111a8cd83ef5654e832293 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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

diff --git a/auxprogs/make_or_upd_vgversion_h b/auxprogs/make_or_upd_vgversion_h
index 6bfe6799dd04244e011cd6720777fa63ddff3114..cacbce3147176dca345d585330e9e4f0390d4ed3 100755 (executable)
--- a/auxprogs/make_or_upd_vgversion_h
+++ b/auxprogs/make_or_upd_vgversion_h
@@ -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