From 17846d12ddd46fb5b1198f67a493fadd2fdfd3db Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Wed, 6 Jun 2018 21:27:18 +0200
Subject: [PATCH] WIP: fixed installation part for pykl module, robustness of
 build system.

---
 src/fontgen/fontgen.pro |  2 ++
 src/pymod/lay/lay.pro   |  4 ++--
 src/pymod/pymod.pri     | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/fontgen/fontgen.pro b/src/fontgen/fontgen.pro
index 1485dd641..c078935eb 100644
--- a/src/fontgen/fontgen.pro
+++ b/src/fontgen/fontgen.pro
@@ -1,4 +1,6 @@
 
+DESTDIR = $$OUT_PWD
+
 TEMPLATE = app
 TARGET = fontgen
 
diff --git a/src/pymod/lay/lay.pro b/src/pymod/lay/lay.pro
index 27875b832..8efe24ceb 100644
--- a/src/pymod/lay/lay.pro
+++ b/src/pymod/lay/lay.pro
@@ -25,6 +25,6 @@ equals(HAVE_QTBINDINGS, "1") {
 QMAKE_POST_LINK += && $(COPY) $$INIT_PY $$DESTDIR/../pykl/__init__.py
 
 # INSTALLS needs to be inside a lib or app templates.
-init_target.path = $$PREFIX/pykl/__init__.py
-init_target.files += $$INIT_PY
+init_target.path = $$PREFIX/pykl
+init_target.files += $$DESTDIR/../pykl/__init__.py
 INSTALLS += init_target
diff --git a/src/pymod/pymod.pri b/src/pymod/pymod.pri
index f558ce444..f4dcc6155 100644
--- a/src/pymod/pymod.pri
+++ b/src/pymod/pymod.pri
@@ -24,7 +24,17 @@ win32 {
   # because the library is called xyx0.dll.
   CONFIG += skip_target_version_ext
 
+  lib_target.path = $$PREFIX/pykl
+  lib_target.files += $$DESTDIR_PYMOD/$${TARGET}.dll
+  INSTALLS = lib_target
+
 } else {
+
   QMAKE_POST_LINK += $(MKDIR) $$DESTDIR_PYMOD && $(COPY) $(DESTDIR)$(TARGET) $$DESTDIR_PYMOD/$${TARGET}.so
+
+  lib_target.path = $$PREFIX/pykl
+  lib_target.files += $$DESTDIR_PYMOD/$${TARGET}.so
+  INSTALLS = lib_target
+
 }