From ac2b10eca5227c06a29d929ea7593cf2c153defc Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sat, 12 Aug 2017 18:48:06 +0200
Subject: [PATCH] Avoid multi-config builds to simplify build scripts.

---
 build.sh                  | 2 +-
 src/plugins/plugin.pri    | 6 +-----
 src/plugins/plugin_ut.pri | 6 +-----
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/build.sh b/build.sh
index 1025ce831..aec6cbf32 100755
--- a/build.sh
+++ b/build.sh
@@ -452,7 +452,7 @@ fi
 $QMAKE -v
 
 qmake_cmd="$QMAKE $CURR_DIR/src/klayout.pro -recursive \
-  CONFIG+=$CONFIG \
+  CONFIG=$CONFIG \
   RUBYLIBFILE=$RUBYLIBFILE \
   RUBYINCLUDE=$RUBYINCLUDE \
   RUBYINCLUDE2=$RUBYINCLUDE2 \
diff --git a/src/plugins/plugin.pri b/src/plugins/plugin.pri
index c3ba2fe89..d9b8fc53f 100644
--- a/src/plugins/plugin.pri
+++ b/src/plugins/plugin.pri
@@ -7,8 +7,4 @@ INCLUDEPATH += ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../l
 DEPENDPATH += ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../lay ../../../common
 LIBS += -L$$DESTDIR_KLP -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay
 
-isEmpty(DESTDIR) {
-  QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut
-} else {
-  QMAKE_POST_LINK += $(COPY) $(DESTDIR_TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut
-}
+QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp
diff --git a/src/plugins/plugin_ut.pri b/src/plugins/plugin_ut.pri
index 0e3386c85..f66aff852 100644
--- a/src/plugins/plugin_ut.pri
+++ b/src/plugins/plugin_ut.pri
@@ -7,8 +7,4 @@ INCLUDEPATH += ../src ../../../db ../../../tl ../../../gsi ../../../laybasic ../
 DEPENDPATH += ../src ../../../db ../../../tl ../../../gsi ../../../laybasic ../../../lay ../../../common ../../../ut
 LIBS += -L$$DESTDIR_KLP -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_lay -lklayout_ut
 
-isEmpty(DESTDIR) {
-  QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut
-} else {
-  QMAKE_POST_LINK += $(COPY) $(DESTDIR_TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut
-}
+QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut