From 9445fae5896d8811f8bbff716c04d5d2b3544434 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 12 Feb 2017 11:31:49 +0530 Subject: [PATCH] build-calibre dir layout changed slightly --- setup/installers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup/installers.py b/setup/installers.py index 79021dc3b1..8b1c22ec2d 100644 --- a/setup/installers.py +++ b/setup/installers.py @@ -30,7 +30,10 @@ def build_single(which, bitness, shutdown=True): dist = os.path.join(build_calibre, 'build', which) if bitness: dist = os.path.join(dist, bitness) - dist = os.path.join(dist, 'dist') + for q in 'dist sw/dist'.split(): + if os.path.exists(os.path.join(dist, q)): + dist = os.path.join(dist, q) + break for x in os.listdir(dist): print(x) dest = os.path.join(base, 'dist', x)