diff --git a/tqtinterface.spec b/tqtinterface.spec index 9dda3c9..5acb4f8 100644 --- a/tqtinterface.spec +++ b/tqtinterface.spec @@ -32,34 +32,34 @@ mkdir tqt.build cd tqt.build cmake \ -DQT_PREFIX_DIR=%{trinity_dir} \ --DMOC_EXECUTABLE=%{trinity_dir}/bin/tqmoc \ +-DMOC_EXECUTABLE=%{trinity_dir}%_bindir/tqmoc \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{buildroot}%{trinity_dir} -DMAN_INSTALL_DIR=%{buildroot}%{trinity_dir}/man \ -DBUILD_ALL="ON" \ -DQT_VERSION=3 \ --DPKG_CONFIG_PATH=%{trinity_dir}/lib/pkgconfig \ +-DPKG_CONFIG_PATH=%{trinity_dir}%_libdir/pkgconfig \ ../%{name}-%{version}/ -export LD_LIBRARY_PATH=%{trinity_dir}/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=%{trinity_dir}%_libdir:$LD_LIBRARY_PATH make %{?_smp_mflags} %install cd ../tqt.build/ -export LD_LIBRARY_PATH=%{trinity_dir}/lib:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH=%{trinity_dir}%_libdir:$LD_LIBRARY_PATH make install export buildroot=%buildroot -sed -i "s#$buildroot##g" %buildroot%trinity_dir/lib64/*.la -sed -i "s#$buildroot##g" %buildroot%trinity_dir/lib64/pkgconfig/*.pc +sed -i "s#$buildroot##g" %buildroot%trinity_dir%_libdir/*.la +sed -i "s#$buildroot##g" %buildroot%trinity_dir%_libdir/pkgconfig/*.pc %check %files -%{trinity_dir}/bin/* -%{trinity_dir}/lib/* +%{trinity_dir}%_bindir/* +%{trinity_dir}%_libdir/* %files devel -%{trinity_dir}/bin/* -%{trinity_dir}/lib/* +%{trinity_dir}%_bindir/* +%{trinity_dir}%_libdir/* %{trinity_dir}/include/* %changelog