From 1921c77796b1310fbb019274e5ac3fb75378a595 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 27 Apr 2020 00:32:23 +0200 Subject: TQt: Improve `qmake.conf` fixing. Signed-off-by: Chris --- dev-tqt/tqt/tqt-14.0.6.ebuild | 8 ++++---- dev-tqt/tqt/tqt-9999.ebuild | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'dev-tqt') diff --git a/dev-tqt/tqt/tqt-14.0.6.ebuild b/dev-tqt/tqt/tqt-14.0.6.ebuild index 9768add3..508b8818 100644 --- a/dev-tqt/tqt/tqt-14.0.6.ebuild +++ b/dev-tqt/tqt/tqt-14.0.6.ebuild @@ -217,13 +217,13 @@ src_compile() { } src_install() { - # Fix qmake.conf files - find "${S}"/mkspecs -name qmake.conf | xargs \ - sed -i -e "s:\$(QTDIR):${TQTBASE}:" || die - # Install TQt with all compiled before emake INSTALL_ROOT="${D}" install + # Fix qmake.conf files + find "${D}${TQTBASE}/mkspecs" -name qmake.conf | xargs \ + sed -i -e "s:\$(QTDIR):${TQTBASE}:" || die + # Fix pkgconfig location dodir /usr/$(get_libdir) mv "${D}${TQTBASE}/$(get_libdir)/pkgconfig" "${D}/usr/$(get_libdir)/" diff --git a/dev-tqt/tqt/tqt-9999.ebuild b/dev-tqt/tqt/tqt-9999.ebuild index 312c892b..bd38baee 100644 --- a/dev-tqt/tqt/tqt-9999.ebuild +++ b/dev-tqt/tqt/tqt-9999.ebuild @@ -216,13 +216,13 @@ src_compile() { } src_install() { - # Fix qmake.conf files - find "${S}"/mkspecs -name qmake.conf | xargs \ - sed -i -e "s:\$(TQTDIR):${TQTBASE}:" || die - # Install TQt with all compiled before emake INSTALL_ROOT="${D}" install + # Fix qmake.conf files + find "${D}${TQTBASE}/mkspecs" -name qmake.conf | xargs \ + sed -i -e "s:\$(TQTDIR):${TQTBASE}:" || die + # Fix pkgconfig location dodir /usr/$(get_libdir) mv "${D}${TQTBASE}/$(get_libdir)/pkgconfig" "${D}/usr/$(get_libdir)/" -- cgit v1.2.1