*fix* use relative path for DOCDIR/MANDIR/DATADIR (a change in CMAKE_INSTALL_PREFIX...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30a63ff747083f34279e224f053701fda71276b2..a5ded33adf754d8084430f8ca16fcf6796fb890b 100644 (file)
--- 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 382bbc3a43949e29372c65baf6d61f39f9a337e7..d527d8683a88e6f3c50fd0bebc3ad969dc67a22e 100644 (file)
--- 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 )