Author: dmacvicar Date: Tue Feb 26 15:36:06 2008 New Revision: 8916 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8916&view=rev Log: - more build fixes for other distros Modified: trunk/sat-solver/CMakeLists.txt trunk/sat-solver/bindings/ruby/CMakeLists.txt trunk/sat-solver/package/libsatsolver.spec.in Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=8916&r1=8915&r2=8916&view=diff ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Tue Feb 26 15:36:06 2008 @@ -23,6 +23,8 @@ 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" ) Modified: trunk/sat-solver/bindings/ruby/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/CMakeLists.txt?rev=8916&r1=8915&r2=8916&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/ruby/CMakeLists.txt Tue Feb 26 15:36:06 2008 @@ -1,9 +1,7 @@ #ADD_SUBDIRECTORY(tests) -EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) - MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") -MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}") +MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDORARCH_DIR}") MESSAGE(STATUS "Ruby include path: ${RUBY_INCLUDE_PATH}") SET( SWIG_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/libsatsolver_wrap.c" ) @@ -36,6 +34,6 @@ TARGET_LINK_LIBRARIES( satsolverx ${RUBY_LIBRARY} ) TARGET_LINK_LIBRARIES( satsolverx ${DB43_LIBRARY} ) -INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDOR_ARCH_DIR}) +INSTALL(TARGETS satsolverx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR}) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/satsolver.rb ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb COPYONLY ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.rb DESTINATION ${RUBY_VENDORLIB_DIR} ) Modified: trunk/sat-solver/package/libsatsolver.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.spec.in?rev=8916&r1=8915&r2=8916&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.spec.in (original) +++ trunk/sat-solver/package/libsatsolver.spec.in Tue Feb 26 15:36:06 2008 @@ -104,10 +104,8 @@ %{_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 -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org