From b95e24c1d992fc14133ce5c841fff64a0e405a5b Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar P Date: Tue, 26 Feb 2008 14:36:06 +0000 Subject: [PATCH] - more build fixes for other distros --- CMakeLists.txt | 2 ++ package/libsatsolver.spec.in | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8074123..91e8624 100644 --- 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 4131afd..4d8b362 100644 --- 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 -- 2.7.4