From e2ede3af0e90ed6a656293b744d91a6e0385403c Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Fri, 3 Jan 2020 14:32:26 +1000
Subject: [PATCH] output into dist/

---
 .gitignore      | 2 +-
 bundle => build | 0
 clean           | 2 ++
 pylib/Makefile  | 4 ++--
 qt/Makefile     | 4 ++--
 rspy/Makefile   | 4 ++--
 6 files changed, 9 insertions(+), 7 deletions(-)
 rename bundle => build (100%)

diff --git a/.gitignore b/.gitignore
index 48fe9de45..7e4935ee6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@
 .build
 .coverage
 .DS_Store
-build
+dist
 pyenv
 .mypy_cache
 __pycache__
diff --git a/bundle b/build
similarity index 100%
rename from bundle
rename to build
diff --git a/clean b/clean
index 57d05baa2..069776e12 100755
--- a/clean
+++ b/clean
@@ -4,6 +4,8 @@ set -e
 
 . scripts.inc
 
+rm -rf dist
+
 for dir in $DEVEL; do
   echo $dir
   (cd $dir && make clean)
diff --git a/pylib/Makefile b/pylib/Makefile
index cd2918b46..877bb4c31 100644
--- a/pylib/Makefile
+++ b/pylib/Makefile
@@ -9,7 +9,7 @@ RUNARGS :=
 BLACKARGS := -t py36 anki tests --exclude='backend_pb2|buildhash'
 ISORTARGS := anki tests
 
-$(shell mkdir -p .build ../build)
+$(shell mkdir -p .build ../dist)
 
 PHONY: all
 all: check
@@ -80,7 +80,7 @@ build: $(BUILD_STEPS) $(CHECKDEPS)
 	rm -rf dist
 	echo "build='$$(git rev-parse --short HEAD)'" > anki/buildhash.py
 	python setup.py bdist_wheel
-	rsync -a dist/*.whl ../build/
+	rsync -a dist/*.whl ../dist/
 
 # prepare code for running in place
 .PHONY: develop
diff --git a/qt/Makefile b/qt/Makefile
index 149a0d129..dab026109 100644
--- a/qt/Makefile
+++ b/qt/Makefile
@@ -9,7 +9,7 @@ MAKEFLAGS += --no-builtin-rules
 BLACKARGS := -t py36 aqt tests --exclude=aqt/forms
 ISORTARGS := aqt tests
 
-$(shell mkdir -p .build ../build)
+$(shell mkdir -p .build ../dist)
 
 PHONY: all
 all: check
@@ -103,7 +103,7 @@ CHECKDEPS := $(shell find aqt tests -name '*.py')
 build: $(BUILD_STEPS)
 	rm -rf dist
 	python setup.py bdist_wheel
-	rsync -a dist/*.whl ../build/
+	rsync -a dist/*.whl ../dist/
 
 .PHONY: develop
 develop: $(BUILD_STEPS)
diff --git a/rspy/Makefile b/rspy/Makefile
index f761cd000..a635db172 100644
--- a/rspy/Makefile
+++ b/rspy/Makefile
@@ -4,9 +4,9 @@ SHELL := bash
 MAKEFLAGS += --warn-undefined-variables
 MAKEFLAGS += --no-builtin-rules
 
-$(shell mkdir -p .build ../build)
+$(shell mkdir -p .build ../dist)
 
-OUTDIR := ../build
+OUTDIR := ../dist
 BUILDFLAGS := --release --strip
 
 .PHONY: all develop build check fix clean