From d6e16c5373b0b306f4fac435db5036552d4bc0d2 Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Thu, 19 Dec 2019 04:35:19 +0100
Subject: [PATCH] Fix bug with loading absolute dependencies on a fresh install

---
 src/ifcblenderexport/Makefile | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/ifcblenderexport/Makefile b/src/ifcblenderexport/Makefile
index 44b70dcadc..9a9ad495e2 100644
--- a/src/ifcblenderexport/Makefile
+++ b/src/ifcblenderexport/Makefile
@@ -22,22 +22,21 @@ ifndef PLATFORM
 endif
 	rm -rf dist
 	mkdir -p dist/working
-	mkdir -p dist/modules
 	mkdir -p dist/blenderbim
 	cp -r blenderbim/* dist/blenderbim/
 
 	cd dist/working && wget https://s3.amazonaws.com/ifcopenshell-builds/ifcblender-python-37-v0.6.0-9bcd932-$(PLATFORM)64.zip
 	cd dist/working && unzip ifcblender*
-	cp -r dist/working/io_import_scene_ifc/ifcopenshell dist/modules/
+	cp -r dist/working/io_import_scene_ifc/ifcopenshell dist/
 	rm -rf dist/working
 
 	mkdir dist/working
 	cd dist/working && wget $(PYTHONOCC_URL)
 	cd dist/working && tar -xjvf pythonocc-core*
 ifeq ($(PLATFORM), win)
-	cd dist/working && cp -r Lib/site-packages/OCC ../modules/
+	cd dist/working && cp -r Lib/site-packages/OCC ../
 else
-	cd dist/working && cp -r lib/python3.7/site-packages/OCC ../modules/
+	cd dist/working && cp -r lib/python3.7/site-packages/OCC ../
 endif
 	rm -rf dist/working
 
@@ -45,9 +44,9 @@ endif
 	cd dist/working && wget $(OCE_URL)
 	cd dist/working && tar -xjvf oce*
 ifeq ($(PLATFORM), win)
-	cd dist/working && cp -r Library/bin/* ../modules/OCC/
+	cd dist/working && cp -r Library/bin/* ../OCC/
 else
-	cd dist/working && cp -r lib/* ../modules/OCC/
+	cd dist/working && cp -r lib/* ../OCC/
 endif
 	rm -rf dist/working
 
@@ -55,33 +54,38 @@ endif
 	cd dist/working && wget $(TBB_URL)
 	cd dist/working && tar -xjvf tbb*
 ifeq ($(PLATFORM), win)
-	cd dist/working && cp -r Library/bin/* ../modules/OCC/
+	cd dist/working && cp -r Library/bin/* ../OCC/
 else
-	cd dist/working && cp -r lib/* ../modules/OCC/
+	cd dist/working && cp -r lib/* ../OCC/
 endif
 	rm -rf dist/working
 
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/d6/fd/eb8c212053addd941cc90baac307c00ac246ac3fce7166b86434c6eae963/pystache-0.5.4.tar.gz
 	cd dist/working && tar -xzvf pystache*
-	cd dist/working/pystache-0.5.4/ && python setup.py build && cp -r build/lib/pystache ../../modules/
+	cd dist/working/pystache-0.5.4/ && python setup.py build && cp -r build/lib/pystache ../../
 	rm -rf dist/working
 
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/79/e8/7eb2ba188eda14a4b47e33b51f3b4978985f4116655c699bcd18c79279b5/svgwrite-1.3.1.zip
 	cd dist/working && unzip svgwrite*
-	cp -r dist/working/svgwrite-1.3.1/svgwrite dist/modules/
+	cp -r dist/working/svgwrite-1.3.1/svgwrite dist/
 	rm -rf dist/working
 
 	mkdir dist/working
 	cd dist/working && wget https://files.pythonhosted.org/packages/00/32/8076fa13e832bb4dcff379f18f228e5a53412be0631808b9ca2610c0f566/pyparsing-2.4.5.tar.gz
 	cd dist/working && tar -xzvf pyparsing*
-	cp -r dist/working/pyparsing-2.4.5/pyparsing.py dist/modules/
+	cp -r dist/working/pyparsing-2.4.5/pyparsing.py dist/
 	rm -rf dist/working
 
 	cd dist/blenderbim && sed -i "s/999999/$(VERSION)/" __init__.py
-	cd dist && zip -r blender28-bim-$(VERSION)-$(PLATFORM).zip blenderbim modules
-	rm -rf dist/blenderbim && rm -rf dist/modules
+	cd dist && zip -r blender28-bim-$(VERSION)-$(PLATFORM).zip ./*
+	rm -rf dist/blenderbim
+	rm -rf dist/ifcopenshell
+	rm -rf dist/OCC
+	rm -rf dist/pystache
+	rm -rf dist/svgwrite
+	rm -rf dist/pyparsing.py
 
 .PHONY: clean
 clean: