diff --git a/.travis.yml b/.travis.yml
index 06d8403ca..29110628f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -247,9 +247,6 @@ script:
         git checkout "$commit"
         git --no-pager show --stat
 
-        # Remove/clean any existing build dir.
-        sudo make distclean
-
         if ! make all check CMAKE_ARGS+="-D DO_COVERAGE=0"; then
           failed="$failed $commit"
         fi
diff --git a/Makefile b/Makefile
index b5d2c80d6..a93930e9b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,12 @@ endif
 
 BUILDDIR=build
 
-all: awesome ;
+# Run "make" in $(BUILDDIR) by default.
+# This is required to generate all files already, which should not be generated
+# with "(sudo) make install" only later.
+cmake-build: $(BUILDDIR)/Makefile
+	$(ECHO) "Building…"
+	$(MAKE) -C $(BUILDDIR)
 
 $(BUILDDIR)/Makefile:
 	$(ECHO) "Creating build directory and running cmake in it. You can also run CMake directly, if you want."