Merge branch 'master' of gitorious.org:opensuse/libzypp-bindings

Fix Conflict (rdoc)

diff --cc swig/ruby/CMakeLists.txt
index edbcf24,a8131c0..08d6329
--- 1/swig/ruby/CMakeLists.txt
--- 2/swig/ruby/CMakeLists.txt
+++ b/swig/ruby/CMakeLists.txt
@@@ -42,18 -42,19 +42,21 @@@ INSTALL(TARGETS zypp_ruby LIBRARY DESTI
  #
  # This requires rdoc-swig from https://github.com/kkaempf/rdoc-swig
  #
- #SET(rdoc_dir "${CMAKE_CURRENT_BINARY_DIR}/html")
- #ADD_CUSTOM_COMMAND (
- #   OUTPUT ${rdoc_dir}
- #   COMMAND ${CMAKE_COMMAND} -E echo_append "Creating rdoc documentation ..."
- #   COMMAND rm -rf ${rdoc_dir}
- #   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rdoc -o ${rdoc_dir} zypp.i *.i ruby/*.i
- #   COMMAND ${CMAKE_COMMAND} -E echo "Done."
- #   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/swig
- #   DEPENDS ${CMAKE_SOURCE_DIR}/swig/*.i ${CMAKE_SOURCE_DIR}/swig/ruby/*.rb ${CMAKE_SOURCE_DIR}/swig/ruby/*.i
- #)
- #ADD_CUSTOM_TARGET(ruby_rdoc ALL DEPENDS "${rdoc_dir}")
++
+ IF(EXISTS ${CMAKE_SOURCE_DIR}/swig/ruby/rdoc)
+ SET(rdoc_dir "${CMAKE_CURRENT_BINARY_DIR}/html")
+ ADD_CUSTOM_COMMAND (
+    OUTPUT ${rdoc_dir}
+    COMMAND ${CMAKE_COMMAND} -E echo_append "Creating rdoc documentation ..."
+    COMMAND rm -rf ${rdoc_dir}
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/rdoc -o ${rdoc_dir} zypp.i *.i ruby/*.i
+    COMMAND ${CMAKE_COMMAND} -E echo "Done."
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/swig
+    DEPENDS ${CMAKE_SOURCE_DIR}/swig/*.i ${CMAKE_SOURCE_DIR}/swig/ruby/*.rb ${CMAKE_SOURCE_DIR}/swig/ruby/*.i
+ )
+ ADD_CUSTOM_TARGET(ruby_rdoc ALL DEPENDS "${rdoc_dir}")
+ ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/swig/ruby/rdoc)
 +
  #
  # Leave this to %doc in the .spec file
  #INSTALL(DIRECTORY "${rdoc_dir}" DESTINATION ${DOC_INSTALL_DIR})