From 164acd8d2e73a124803dc451db7ce83982458eb6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C3=ADas=20Fonzo?= Date: Tue, 28 Jan 2020 15:02:33 -0300 Subject: [PATCH] recipes: tde/tqt3: set correct plugindir, fix wrong symlinks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Matías Fonzo --- recipes/tde/tqt3/recipe | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/recipes/tde/tqt3/recipe b/recipes/tde/tqt3/recipe index 579b255c..017f6f2c 100644 --- a/recipes/tde/tqt3/recipe +++ b/recipes/tde/tqt3/recipe @@ -82,7 +82,7 @@ build() echo yes | ./configure -L/usr/lib${libSuffix} \ -prefix /opt/trinity/lib${libSuffix}/${pkgname}-${version} \ - -plugindir /opt/trinity/lib${libSuffix}/tqt3/plugins \ + -plugindir /opt/trinity/lib${libSuffix}/${pkgname}-${version}/plugins \ -sysconfdir /opt/etc \ -sysshare /usr/share \ -docdir $docsdir \ @@ -153,7 +153,9 @@ EOF cd "${destdir}/opt/trinity/lib${libSuffix}/${pkgname}-${version}"/lib/pkgconfig/ for file in *.pc do - ln -sf $file ../../../pkgconfig/${file} + ln -sf \ + "/opt/trinity/lib${libSuffix}/${pkgname}-${version}/lib/pkgconfig/${file}" \ + "${destdir}/opt/trinity/lib${libSuffix}/pkgconfig/${file}" done # Link tqt3's programs at /opt/trinity/bin @@ -162,7 +164,11 @@ EOF cd "${destdir}/opt/trinity/lib${libSuffix}/${pkgname}-${version}"/bin/ for file in * do - test -x "$file" && ln -sf $file ../../../bin/${file} + test -x "$file" || continue; + + ln -sf \ + "/opt/trinity/lib${libSuffix}/${pkgname}-${version}/bin/${file}" \ + "${destdir}/opt/trinity/bin/${file}" done cd -- "${TMPDIR}/$srcdir" -- 2.11.4.GIT