diff --git a/desktop/toolkit/qt5/qt5-configuration/actions.py b/desktop/toolkit/qt5/qt5-configuration/actions.py index ef853544d9..8090a2a019 100644 --- a/desktop/toolkit/qt5/qt5-configuration/actions.py +++ b/desktop/toolkit/qt5/qt5-configuration/actions.py @@ -11,7 +11,9 @@ from pisi.actionsapi import shelltools def setup(): shelltools.makedirs("build") shelltools.cd("build") - cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr", sourceDir="..") + cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib", sourceDir="..") + def build(): shelltools.cd("build") cmaketools.make() @@ -19,7 +21,7 @@ def build(): def install(): shelltools.cd("build") cmaketools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.domove("/usr/lib64/*", "/usr/lib") - pisitools.removeDir("/usr/lib64") + #pisitools.domove("/usr/lib64/*", "/usr/lib") + #pisitools.removeDir("/usr/lib64") shelltools.cd("..") pisitools.dodoc("LICENSE.FDL", "LICENSE.GPL", "LICENSE.LGPL", "README.md") diff --git a/desktop/toolkit/qt5/qt5-configuration/pspec.xml b/desktop/toolkit/qt5/qt5-configuration/pspec.xml index e925848161..dea49fe971 100644 --- a/desktop/toolkit/qt5/qt5-configuration/pspec.xml +++ b/desktop/toolkit/qt5/qt5-configuration/pspec.xml @@ -53,6 +53,13 @@ + + 2018-11-02 + 0.3.1 + Rebuild + Mustafa Cinasal + muscnsl@gmail.com + 2018-10-15 0.3.1