Merge tag 'v2.9.5' into maint-2.10

diff --git a/t/perf/run b/t/perf/run
index cfd70129bb70f7ed88d999421f3bc432119233c1..e8adedadfdca8549b3c4f8f8a19d383a7611f4ad 100755 (executable)
--- a/t/perf/run
+++ b/t/perf/run
@@ -30,7 +30,13 @@ unpack_git_rev () {
 }
 build_git_rev () {
        rev=$1
-       cp ../../config.mak build/$rev/config.mak
+       for config in config.mak config.mak.autogen config.status
+       do
+               if test -e "../../$config"
+               then
+                       cp "../../$config" "build/$rev/"
+               fi
+       done
        (cd build/$rev && make $GIT_PERF_MAKE_OPTS) ||
        die "failed to build revision '$mydir'"
 }