From 4dc0065028d572ed125008d63d2e460b8d15bc56 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Wed, 20 Jun 2018 13:37:41 +0200
Subject: [PATCH] WIP: fixed installation target for pymod __init__.py file for
 older Qt versions.

---
 src/pymod/lay/lay.pro | 18 ------------------
 src/pymod/tl/tl.pro   | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/pymod/lay/lay.pro b/src/pymod/lay/lay.pro
index 70ba3b2c2..5555294e0 100644
--- a/src/pymod/lay/lay.pro
+++ b/src/pymod/lay/lay.pro
@@ -10,21 +10,3 @@ HEADERS += \
 
 LIBS += -lklayout_lay
 
-# Use this opportunity to provide the __init__.py file
-
-equals(HAVE_QTBINDINGS, "1") {
-  equals(HAVE_QT5, "1") {
-    INIT_PY = $$PWD/../__init__.py.qt5
-  } else {
-    INIT_PY = $$PWD/../__init__.py.qt4
-  }
-} else {
-  INIT_PY = $$PWD/../__init__.py.noqt
-}
-
-QMAKE_POST_LINK += && $(COPY) $$INIT_PY $$DESTDIR_PYMOD/__init__.py
-
-# INSTALLS needs to be inside a lib or app templates.
-init_target.path = $$PREFIX/pymod/klayout
-init_target.files += $$DESTDIR_PYMOD/__init__.py
-INSTALLS += init_target
diff --git a/src/pymod/tl/tl.pro b/src/pymod/tl/tl.pro
index 30961c2b5..b6093d661 100644
--- a/src/pymod/tl/tl.pro
+++ b/src/pymod/tl/tl.pro
@@ -8,3 +8,24 @@ SOURCES = \
 
 HEADERS += \
 
+# Use this opportunity to provide the __init__.py file
+
+equals(HAVE_QTBINDINGS, "1") {
+  equals(HAVE_QT5, "1") {
+    INIT_PY = $$PWD/../__init__.py.qt5
+  } else {
+    INIT_PY = $$PWD/../__init__.py.qt4
+  }
+} else {
+  INIT_PY = $$PWD/../__init__.py.noqt
+}
+
+QMAKE_POST_LINK += && $(COPY) $$INIT_PY $$DESTDIR_PYMOD/__init__.py
+
+# INSTALLS needs to be inside a lib or app templates.
+init_target.path = $$PREFIX/pymod/klayout
+# This would be nice:
+#   init_target.files += $$DESTDIR_PYMOD/__init__.py
+# but some Qt versions need this explicitly:
+init_target.extra = $(INSTALL_PROGRAM) $$DESTDIR_PYMOD/__init__.py $(INSTALLROOT)$$PREFIX/pymod/klayout
+INSTALLS += init_target