Author: kkaempf Date: Thu Aug 7 14:43:25 2008 New Revision: 10782 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10782&view=rev Log: fix install pathes for Perl and Python Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt trunk/sat-solver/bindings/python/CMakeLists.txt Modified: trunk/sat-solver/bindings/perl/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/perl/CMakeLists.txt?rev=10782&r1=10781&r2=10782&view=diff ============================================================================== --- trunk/sat-solver/bindings/perl/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/perl/CMakeLists.txt Thu Aug 7 14:43:25 2008 @@ -20,8 +20,7 @@ MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") MESSAGE(STATUS "Perl core dir: ${PERL_CORE_DIR}") -MESSAGE(STATUS "Perl vendor arch dir: ${PERL_VENDOR_ARCH}") -MESSAGE(STATUS "Perl vendor lib dir: ${PERL_VENDOR_LIB}") +MESSAGE(STATUS "Perl vendor arch dir: ${PERL_VENDORDIR}") ADD_DEFINITIONS( ${PERL_CCFLAGS} -Wno-unused -Wno-error ) LINK_DIRECTORIES( ${PERL_CORE_DIR} ) Modified: trunk/sat-solver/bindings/python/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/python/CMakeLists.txt?rev=10782&r1=10781&r2=10782&view=diff ============================================================================== --- trunk/sat-solver/bindings/python/CMakeLists.txt (original) +++ trunk/sat-solver/bindings/python/CMakeLists.txt Thu Aug 7 14:43:25 2008 @@ -16,9 +16,13 @@ FIND_PACKAGE(PythonInterp) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.path[2])" OUTPUT_VARIABLE PYTHON_LIB_DIR) +IF (NOT PYTHON_SITEDIR) +SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR}/site-packages) +ENDIF (NOT PYTHON_SITEDIR) + MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") MESSAGE(STATUS "Python lib dir: ${PYTHON_LIB_DIR}") -MESSAGE(STATUS "Python site dir: ${PYTHON_LIB_DIR}/site-packages") +MESSAGE(STATUS "Python site dir: ${PYTHON_SITEDIR}") ADD_CUSTOM_COMMAND ( OUTPUT "${SWIG_OUTPUT}" @@ -43,6 +47,6 @@ TARGET_LINK_LIBRARIES( satsolver_python ${PYTHON_LIBRARIES} ) TARGET_LINK_LIBRARIES( satsolver_python ${RPMDB_LIBRARY} ) -INSTALL(TARGETS satsolver_python LIBRARY DESTINATION ${PYTHON_LIB_DIR}/site-packages) +INSTALL(TARGETS satsolver_python LIBRARY DESTINATION ${PYTHON_SITEDIR}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.py DESTINATION ${PYTHON_LIB_DIR}/site-packages ) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/satsolver.py DESTINATION ${PYTHON_SITEDIR} ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org