summaryrefslogtreecommitdiffstats
path: root/redhat/dependencies
diff options
context:
space:
mode:
authoralbator <albator@arcadia.vtf>2011-09-10 19:23:44 +0200
committeralbator <albator@arcadia.vtf>2011-09-10 19:23:44 +0200
commit89bffdf4611085447a41efc0c2c8f49b46a3c942 (patch)
treeccc39d341b91b7a0745dee84e1611555b71232ea /redhat/dependencies
parentf14a4cc47a9364e56b0fe7db659499b33cb951ae (diff)
downloadtde-packaging-89bffdf4611085447a41efc0c2c8f49b46a3c942.tar.gz
tde-packaging-89bffdf4611085447a41efc0c2c8f49b46a3c942.zip
Slight updates on basic components
Diffstat (limited to 'redhat/dependencies')
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
index 3a35c6866..1764eda3d 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec
@@ -7,6 +7,9 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
+%define cmake_modules_dir %{_datadir}/cmake
+%else
+%define cmake_modules_dir %{_datadir}/cmake/Modules
%endif
# TQT include files may conflict with QT4 includes, so we move them to a subdirectory.
@@ -77,9 +80,9 @@ sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \
-e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,'
# Install 'cmake' modules for a specific package (for later use)
-%__mkdir_p %{?buildroot}%{_usr}/share/cmake/Modules
+%__mkdir_p %{?buildroot}%{cmake_modules_dir}
for i in cmake/modules/*.cmake; do
- install -m 644 $i %{?buildroot}%{_usr}/share/cmake/Modules
+ install -m 644 $i %{?buildroot}%{cmake_modules_dir}
done
%clean
@@ -94,7 +97,7 @@ done
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/pkgconfig/*.pc
-%{_usr}/share/cmake/Modules/*.cmake
+%{cmake_modules_dir}/*.cmake
%changelog