Merge from trunk, r12964 (partial) and r12983 (3.8.0 release tarball

missing some files, #306310).

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_8_BRANCH@12984

diff --git a/Makefile.am b/Makefile.am
index 4dfb8061a100e24c6a54c108b5ef78962855da64..7e6f1272bcdd273addc67ef3ddd91da33b2fd1fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,11 +99,13 @@ EXTRA_DIST = \
        README_MISSING_SYSCALL_OR_IOCTL \
        README.s390 \
        README.android \
+       README.android_emulator \
        README.mips \
        NEWS.old \
        valgrind.pc.in \
        valgrind.spec.in \
-       valgrind.spec
+       valgrind.spec \
+       autogen.sh
 
 dist_noinst_SCRIPTS = \
        vg-in-place

diff --git a/README.android b/README.android
index 138f64487220019bffeb752972c410ffd26d1370..d39a1da60485fe0a7384c5098260cde608e1a9b2 100644 (file)
--- a/README.android
+++ b/README.android
@@ -77,6 +77,9 @@ export CC=$NDKROOT/toolchains/x86-4.4.3/prebuilt/linux-x86/bin/i686-android-linu
 # different if /sdcard doesn't work on the device -- this is
 # a known cause of difficulties.
 
+# The below re-generates configure, Makefiles, ...
+# This is not needed if you start from a release tarball.
+# (in any case, the release tarball does not contain the autogen.sh file).
 ./autogen.sh
 
 # for ARM