- more build fixes for other distros
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Tue, 26 Feb 2008 14:36:06 +0000 (14:36 +0000)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Tue, 26 Feb 2008 14:36:06 +0000 (14:36 +0000)
CMakeLists.txt
package/libsatsolver.spec.in

index 8074123..91e8624 100644 (file)
@@ -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" )
index 4131afd..4d8b362 100644 (file)
@@ -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