diff --git a/build.sh b/build.sh index aec6cbf32..1025ce831 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 d9b8fc53f..516688781 100644 --- a/src/plugins/plugin.pri +++ b/src/plugins/plugin.pri @@ -1,5 +1,6 @@ DESTDIR_KLP = $$OUT_PWD/../../.. +DESTDIR = $$OUT_PWD/.. TEMPLATE = lib @@ -7,4 +8,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 -QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp +QMAKE_POST_LINK += $(COPY) $(DESTDIR)$(TARGET) $$DESTDIR_KLP/$${TARGET}.klp diff --git a/src/plugins/plugin_ut.pri b/src/plugins/plugin_ut.pri index f66aff852..79ebb9dea 100644 --- a/src/plugins/plugin_ut.pri +++ b/src/plugins/plugin_ut.pri @@ -1,5 +1,6 @@ DESTDIR_KLP = $$OUT_PWD/../../.. +DESTDIR = $$OUT_PWD/.. TEMPLATE = lib @@ -7,4 +8,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 -QMAKE_POST_LINK += $(COPY) $(TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut +QMAKE_POST_LINK += $(COPY) $(DESTDIR)$(TARGET) $$DESTDIR_KLP/$${TARGET}.klp_ut