From de147b5a9327cc1d856900d493bc9e093b9d42f1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Mon, 15 Jan 2018 22:42:12 +0100
Subject: Fix Makefile and make sure it's tested

Fixes #3492

(cherry picked from commit d06f07af80f1858d960d4ea6edd71546da280d93)
---
 doc/changelog.asciidoc       | 8 ++++++++
 misc/Makefile                | 2 +-
 scripts/dev/build_release.py | 9 +++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index de5697679..adcf8fdaa 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -15,6 +15,14 @@ breaking changes (such as renamed commands) can happen in minor releases.
 // `Fixed` for any bug fixes.
 // `Security` to invite users to upgrade in case of vulnerabilities.
 
+v1.1.1 (unreleased)
+-------------------
+
+Fixed
+~~~~~
+
+- The Makefile now actually works.
+
 v1.1.0
 ------
 
diff --git a/misc/Makefile b/misc/Makefile
index fe97eb6bf..714223d10 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -21,5 +21,5 @@ install: doc/qutebrowser.1.html
 		$(wildcard misc/userscripts/*)
 	install -Dm755 -t "$(DESTDIR)/usr/share/qutebrowser/scripts/" \
 		$(filter-out scripts/__init__.py scripts/__pycache__ scripts/dev \
-		  scripts/testbrowser_cpp scripts/asciidoc2html.py scripts/setupcommon.py \
+		  scripts/testbrowser scripts/asciidoc2html.py scripts/setupcommon.py \
 			scripts/link_pyqt.py,$(wildcard scripts/*))
diff --git a/scripts/dev/build_release.py b/scripts/dev/build_release.py
index ce0ea2b8e..aa4046adc 100755
--- a/scripts/dev/build_release.py
+++ b/scripts/dev/build_release.py
@@ -328,6 +328,14 @@ def build_sdist():
     return artifacts
 
 
+def test_makefile():
+    """Make sure the Makefile works correctly."""
+    utils.print_title("Testing makefile")
+    with tempfile.TemporaryDirectory() as tmpdir:
+        subprocess.run(['make', '-f', 'misc/Makefile',
+                        'DESTDIR={}'.format(tmpdir), 'install'], check=True)
+
+
 def read_github_token():
     """Read the GitHub API token from disk."""
     token_file = os.path.join(os.path.expanduser('~'), '.gh_token')
@@ -403,6 +411,7 @@ def main():
     elif sys.platform == 'darwin':
         artifacts = build_mac()
     else:
+        test_makefile()
         artifacts = build_sdist()
         upload_to_pypi = True
 
-- 
cgit v1.2.3-54-g00ecf