From 8e5a1520cd5e901f514c382ad17e77d64727896a Mon Sep 17 00:00:00 2001
From: Michael Schwarz <michi.schwarz@gmail.com>
Date: Wed, 10 Dec 2014 22:13:34 +0100
Subject: [PATCH] Moved DXF export scripts to separate directory.

---
 Makefile                                                  | 3 ++-
 support/dxf_export/__init__.py                            | 0
 {dxf_export => support/dxf_export}/__main__.py            | 0
 {dxf_export => support/dxf_export}/better_dxf_outlines.py | 0
 {dxf_export => support/dxf_export}/bezmisc.py             | 0
 {dxf_export => support/dxf_export}/cspsubdiv.py           | 0
 {dxf_export => support/dxf_export}/cubicsuperpath.py      | 0
 {dxf_export => support/dxf_export}/dxf_templates.py       | 0
 {dxf_export => support/dxf_export}/ffgeom.py              | 0
 {dxf_export => support/dxf_export}/inkex.py               | 0
 {dxf_export => support/dxf_export}/simplepath.py          | 0
 {dxf_export => support/dxf_export}/simplestyle.py         | 0
 {dxf_export => support/dxf_export}/simpletransform.py     | 0
 13 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 support/dxf_export/__init__.py
 rename {dxf_export => support/dxf_export}/__main__.py (100%)
 rename {dxf_export => support/dxf_export}/better_dxf_outlines.py (100%)
 rename {dxf_export => support/dxf_export}/bezmisc.py (100%)
 rename {dxf_export => support/dxf_export}/cspsubdiv.py (100%)
 rename {dxf_export => support/dxf_export}/cubicsuperpath.py (100%)
 rename {dxf_export => support/dxf_export}/dxf_templates.py (100%)
 rename {dxf_export => support/dxf_export}/ffgeom.py (100%)
 rename {dxf_export => support/dxf_export}/inkex.py (100%)
 rename {dxf_export => support/dxf_export}/simplepath.py (100%)
 rename {dxf_export => support/dxf_export}/simplestyle.py (100%)
 rename {dxf_export => support/dxf_export}/simpletransform.py (100%)

diff --git a/Makefile b/Makefile
index 1b50f45..5a77c48 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 INKSCAPE ?= inkscape
 OPENSCAD ?= openscad
+PYTHON ?= python2
 
 # Used by dxf_export/main.sh
 export INKSCAPE
@@ -36,7 +37,7 @@ $(foreach i,$(COMPILED_SCAD_FILES),$(eval $(i): $(filter $(dir $(i))%,$(LIBRARY_
 
 # Rule to convert an SVG file to a DXF file.
 %.dxf: %.svg
-	python2 dxf_export $< $@
+	PYTHONPATH="support:$$PYTHONPATH" $(PYTHON) -m dxf_export $< $@
 
 # Rule to compile an OpenSCAD file to an STL file.
 %.stl: %.scad
diff --git a/support/dxf_export/__init__.py b/support/dxf_export/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/dxf_export/__main__.py b/support/dxf_export/__main__.py
similarity index 100%
rename from dxf_export/__main__.py
rename to support/dxf_export/__main__.py
diff --git a/dxf_export/better_dxf_outlines.py b/support/dxf_export/better_dxf_outlines.py
similarity index 100%
rename from dxf_export/better_dxf_outlines.py
rename to support/dxf_export/better_dxf_outlines.py
diff --git a/dxf_export/bezmisc.py b/support/dxf_export/bezmisc.py
similarity index 100%
rename from dxf_export/bezmisc.py
rename to support/dxf_export/bezmisc.py
diff --git a/dxf_export/cspsubdiv.py b/support/dxf_export/cspsubdiv.py
similarity index 100%
rename from dxf_export/cspsubdiv.py
rename to support/dxf_export/cspsubdiv.py
diff --git a/dxf_export/cubicsuperpath.py b/support/dxf_export/cubicsuperpath.py
similarity index 100%
rename from dxf_export/cubicsuperpath.py
rename to support/dxf_export/cubicsuperpath.py
diff --git a/dxf_export/dxf_templates.py b/support/dxf_export/dxf_templates.py
similarity index 100%
rename from dxf_export/dxf_templates.py
rename to support/dxf_export/dxf_templates.py
diff --git a/dxf_export/ffgeom.py b/support/dxf_export/ffgeom.py
similarity index 100%
rename from dxf_export/ffgeom.py
rename to support/dxf_export/ffgeom.py
diff --git a/dxf_export/inkex.py b/support/dxf_export/inkex.py
similarity index 100%
rename from dxf_export/inkex.py
rename to support/dxf_export/inkex.py
diff --git a/dxf_export/simplepath.py b/support/dxf_export/simplepath.py
similarity index 100%
rename from dxf_export/simplepath.py
rename to support/dxf_export/simplepath.py
diff --git a/dxf_export/simplestyle.py b/support/dxf_export/simplestyle.py
similarity index 100%
rename from dxf_export/simplestyle.py
rename to support/dxf_export/simplestyle.py
diff --git a/dxf_export/simpletransform.py b/support/dxf_export/simpletransform.py
similarity index 100%
rename from dxf_export/simpletransform.py
rename to support/dxf_export/simpletransform.py