From: Andreas Fink Date: Sat, 12 Jun 2010 09:27:18 +0000 (+0000) Subject: *fix* use relative path for DOCDIR/MANDIR/DATADIR (a change in CMAKE_INSTALL_PREFIX... X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=baef2c5ef3da2ae67400345beeb7853d60ec28b2;p=chaz%2Ftint2 *fix* use relative path for DOCDIR/MANDIR/DATADIR (a change in CMAKE_INSTALL_PREFIX works now) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 30a63ff..a5ded33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,10 +62,10 @@ if( ENABLE_TINT2CONF ) add_dependencies( tint2conf version ) endif( ENABLE_TINT2CONF ) -set( MANDIR ${CMAKE_INSTALL_PREFIX}/share/man) -set( DATADIR ${CMAKE_INSTALL_PREFIX}/share) -set( SYSCONFDIR /etc) -set( DOCDIR ${CMAKE_INSTALL_PREFIX}/share/doc/tint2) +set( MANDIR share/man CACHE PATH "Directory for man pages" ) +set( DATADIR share CACHE PATH "Directory for shared data" ) +set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" ) +set( DOCDIR share/doc/tint2 CACHE PATH "Directory for documentation files" ) add_custom_target( version ALL "${PROJECT_SOURCE_DIR}/get_svnrev.sh" "\"${PROJECT_SOURCE_DIR}\"" ) @@ -89,8 +89,8 @@ if( RT_LIBRARY ) target_link_libraries( tint2 ${RT_LIBRARY} ) endif( RT_LIBRARY ) -add_dependencies(tint2 version) -set_target_properties(tint2 PROPERTIES COMPILE_FLAGS -Wall) +add_dependencies( tint2 version ) +set_target_properties( tint2 PROPERTIES COMPILE_FLAGS -Wall ) #set_target_properties(tint2 PROPERTIES LINK_FLAGS -Wl,--as-needed) install( TARGETS tint2 DESTINATION bin ) diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt index 382bbc3..d527d86 100644 --- a/src/tint2conf/CMakeLists.txt +++ b/src/tint2conf/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries( tint2conf ${X11_LIBRARIES} ${GTHREAD2_LIBRARIES} ${GTK2_LIBRARIES} ) -set_target_properties(tint2conf PROPERTIES COMPILE_FLAGS -Wall) +set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS -Wall ) #set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed) install( TARGETS tint2conf DESTINATION bin )