diff -u -r libplist-0.8.orig//CMakeLists.txt libplist-0.8//CMakeLists.txt --- libplist-0.8.orig//CMakeLists.txt 2009-04-04 14:27:50.000000000 +0200 +++ libplist-0.8//CMakeLists.txt 2009-04-04 14:34:28.000000000 +0200 @@ -11,6 +11,10 @@ cmake_minimum_required(VERSION 2.6) +IF(NOT DEFINED CMAKE_INSTALL_LIBDIR) + SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries") +ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR) + FIND_PACKAGE( LibXml2 REQUIRED ) FIND_PACKAGE( GLIB2 REQUIRED ) FIND_PACKAGE( SWIG ) @@ -36,7 +40,7 @@ ########## PkgConfig ############################ CONFIGURE_FILE( "libplist.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libplist.pc" ) ########## INSTALL ############################## -INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libplist.pc" DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig/ ) +INSTALL( FILES "${CMAKE_CURRENT_BINARY_DIR}/libplist.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ ) ########## CPack ################################ INCLUDE( libplistPackaging ) diff -u -r libplist-0.8.orig//libplist.pc.in libplist-0.8//libplist.pc.in --- libplist-0.8.orig//libplist.pc.in 2009-04-04 14:27:50.000000000 +0200 +++ libplist-0.8//libplist.pc.in 2009-04-04 15:02:59.000000000 +0200 @@ -1,12 +1,12 @@ prefix=${CMAKE_INSTALL_PREFIX} exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_PREFIX}/lib +libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} includedir=${CMAKE_INSTALL_PREFIX}/include Name: libplist Description: A library to handle Apple Property Lists whereas they are binary or XML Version: ${LIBPLIST_VERSION} Requires: libxml-2.0 >= 2.6.30 glib-2.0 >= 2.14.1 -Libs: -L${CMAKE_INSTALL_PREFIX}/lib -lplist +Libs: -L${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} -lplist Cflags: -I${CMAKE_INSTALL_PREFIX}/include diff -u -r libplist-0.8.orig//src/CMakeLists.txt libplist-0.8//src/CMakeLists.txt --- libplist-0.8.orig//src/CMakeLists.txt 2009-04-04 14:27:50.000000000 +0200 +++ libplist-0.8//src/CMakeLists.txt 2009-04-04 14:33:18.000000000 +0200 @@ -14,5 +14,5 @@ INSTALL(TARGETS plist RUNTIME DESTINATION bin COMPONENT lib - LIBRARY DESTINATION lib COMPONENT dev - ARCHIVE DESTINATION lib COMPONENT dev) + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT dev) diff -u -r libplist-0.8.orig//swig/CMakeLists.txt libplist-0.8//swig/CMakeLists.txt --- libplist-0.8.orig//swig/CMakeLists.txt 2009-04-04 14:27:50.000000000 +0200 +++ libplist-0.8//swig/CMakeLists.txt 2009-04-04 14:33:40.000000000 +0200 @@ -8,9 +8,9 @@ SWIG_LINK_LIBRARIES( PList plist ${PYTHON_LIBRARIES} ) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/_PList${CMAKE_SHARED_MODULE_SUFFIX} - DESTINATION lib/python${PYTHON_VERSION}/site-packages/libplist/ ) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages/libplist/ ) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/__init__.py - DESTINATION lib/python${PYTHON_VERSION}/site-packages/libplist/ ) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION}/site-packages/libplist/ ) INSTALL( FILES ${CMAKE_CURRENT_SOURCE_DIR}/plist.i DESTINATION include/plist/swig COMPONENT dev)