From 3efde26584afd5f2f75b135ca1301bafda7eee6a Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 29 Jul 2018 02:45:59 +0200
Subject: [PATCH] Cleaner builds for RPM & DEB

---
 scripts/makedeb.sh            | 7 +++++--
 scripts/rpm-data/klayout.spec | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/makedeb.sh b/scripts/makedeb.sh
index fa9bbc60f..2ced7ad03 100755
--- a/scripts/makedeb.sh
+++ b/scripts/makedeb.sh
@@ -53,11 +53,14 @@ libdir="usr/lib/klayout"
 # TODO: is there a better way to produce this path?
 pylibdir="usr/lib/python3/dist-packages/klayout"
 
-# @@@ TODO: remove -without-qtbinding
+# clean bin directory
+rm -rf $bininstdir
+
+# do the actual build
 ./build.sh -j2 \
            -bin $bininstdir \
            -build $builddir \
-           -rpath /$libdir -without-qtbinding
+           -rpath /$libdir 
 
 if [ "$bits" = "32" ]; then
   arch="i386"
diff --git a/scripts/rpm-data/klayout.spec b/scripts/rpm-data/klayout.spec
index d78c8655e..4c5bf73ad 100644
--- a/scripts/rpm-data/klayout.spec
+++ b/scripts/rpm-data/klayout.spec
@@ -92,11 +92,15 @@ cd %{git_source}
 %else
 cd %{_sourcedir}
 %endif
-# @@@ remove -without-qtbinding
+
+# clean bin dir
+rm -rf %{_builddir}/bin.$TARGET
+
+# do the actual build
 ./build.sh -rpath %{_libdir}/klayout \
            -bin %{_builddir}/bin.$TARGET \
            -build %{_builddir}/build.$TARGET \
-           %{buildopt} -without-qtbinding
+           %{buildopt} 
 
 cp -p LICENSE Changelog CONTRIB %{_builddir}
 strip %{_builddir}/bin.$TARGET/*.so