diff --git a/x11/library/libclc/actions.py b/x11/library/libclc/actions.py index 4b37a5cf8b..941cab621e 100755 --- a/x11/library/libclc/actions.py +++ b/x11/library/libclc/actions.py @@ -13,17 +13,18 @@ from pisi.actionsapi import get libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib" def setup(): - - + pisitools.dosed("CMakeLists.txt", "{CMAKE_INSTALL_DATADIR}", "{CMAKE_INSTALL_LIBDIR}") if get.buildTYPE() == "emul32": shelltools.system("chmod +x clang32") options = "-DLLVM_CLANG='%s/%s-%s/clang32' \ -DLLVM_CONFIG='/usr/bin/llvm-config-32' \ + -DCMAKE_INSTALL_LIBDIR=lib32 \ " % (get.workDIR(), get.srcNAME(), get.srcVERSION()) else: options = "-DLLVM_CLANG='/usr/bin/clang' \ -DLLVM_CONFIG='/usr/bin/llvm-config' \ + -DCMAKE_INSTALL_LIBDIR=lib \ " cmaketools.configure(options) @@ -34,8 +35,8 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.domove("/usr/share/clc/", "%s" %libdir) - pisitools.domove("/usr/share/pkgconfig/libclc.pc", "%s/pkgconfig" % libdir) + #pisitools.domove("/usr/share/clc/", "%s" %libdir) + #pisitools.domove("/usr/share/pkgconfig/libclc.pc", "%s/pkgconfig" % libdir) if get.buildTYPE() == "emul32": shelltools.system("sed -i 's/\/usr\/share/\/usr\/lib32/' %s/usr/lib32/pkgconfig/libclc.pc" % get.installDIR()) @@ -43,6 +44,6 @@ def install(): shelltools.system("sed -i 's/\/usr\/share/\/usr\/lib/' %s/usr/lib/pkgconfig/libclc.pc" % get.installDIR()) #pisitools.removeDir("/usr/share/clc") - pisitools.removeDir("/usr/share/pkgconfig") + #pisitools.removeDir("/usr/share/pkgconfig") pisitools.dodoc("LICENSE*", "README*")