- more build fixes for other distros

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8074123576dc6d18f3343fde24022f4379a142fd..91e86247e6b382a74473900d0764ab58dcf6e02f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,8 @@ INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
 
 FIND_PACKAGE(EXPAT REQUIRED)
 FIND_PACKAGE(Ruby)
+MESSAGE(STATUS "ruby destinations: ${RUBY_VENDORLIB_DIR} | ${RUBY_VENDORARCH_DIR}")
+
 FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
 
 SET( PACKAGE "satsolver" )

diff --git a/package/libsatsolver.spec.in b/package/libsatsolver.spec.in
index 4131afd26eafb651de7ae815557db87c0da9850f..4d8b362ae3321daff52587a24b3d46b526345cc2 100644 (file)
--- a/package/libsatsolver.spec.in
+++ b/package/libsatsolver.spec.in
@@ -104,10 +104,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/satsolverx.so
 %{_libdir}/ruby/vendor_ruby/%{rb_ver}/satsolver.rb
 %else
-%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
-%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
-%{ruby_sitearch}/satsolverx.so
-%{ruby_sitelib}/satsolver.rb
+%{ruby_sitearchdir}/satsolverx.so
+%{ruby_sitelibdir}/satsolver.rb
 %endif