Merge branch 'ta/config-set'

diff --git a/Makefile b/Makefile
index b7462e339831f231e9cd15a372cc5d35d0be5758..30cc622f08ba9ba69b727c1b6a4933d2d9158de4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1660,7 +1660,11 @@ endif
 profile:: profile-clean
        $(MAKE) PROFILE=GEN all
        $(MAKE) PROFILE=GEN -j1 test
-       $(MAKE) PROFILE=GEN -j1 perf
+       @if test -n "$$GIT_PERF_REPO" || test -d .git; then \
+               $(MAKE) PROFILE=GEN -j1 perf; \
+       else \
+               echo "Skipping profile of perf tests..."; \
+       fi
        $(MAKE) PROFILE=USE all
 
 profile-fast: profile-clean