*fix* change the default location of tintwizard.py to ${CMAKE_INSTALL_PREFIX}/bin...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5ded33adf754d8084430f8ca16fcf6796fb890b..8ef88ad809b2da30d38d43d82e9fbf0c373d5021 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,7 +57,7 @@ if( ENABLE_BATTERY )
 endif( ENABLE_BATTERY )
 
 if( ENABLE_TINT2CONF )
-  add_definitions( -DBUILD_CMAKE )
+  add_definitions( -DHAVE_VERSION_H )
   add_subdirectory( src/tint2conf )
   add_dependencies( tint2conf version )
 endif( ENABLE_TINT2CONF )

diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
index d527d8683a88e6f3c50fd0bebc3ad969dc67a22e..a9a8e2aa7aab454407ba28200d0c717d60ad7177 100644 (file)
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -28,6 +28,7 @@ target_link_libraries( tint2conf ${X11_LIBRARIES}
                                  ${GTHREAD2_LIBRARIES}
                                  ${GTK2_LIBRARIES} )
 
+add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
 set_target_properties( tint2conf PROPERTIES COMPILE_FLAGS -Wall )
 #set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed)
 

diff --git a/src/tint2conf/main.c b/src/tint2conf/main.c
index 135b761f60bf4ef38f32a9540a268f4740acaa1d..617eed940c08f5e7ea446024f4f7f7e2bdb859ad 100644 (file)
--- a/src/tint2conf/main.c
+++ b/src/tint2conf/main.c
@@ -28,10 +28,8 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 
-#ifdef BUILD_CMAKE
+#ifdef HAVE_VERSION_H
   #include "version.h"
-#else
-  #include "../version.h"
 #endif
 #include "common.h"
 #include "theme_view.h"
@@ -581,7 +579,7 @@ void read_config()
        }
        g_width = 500;
        g_height = 350;
-       g_cmd_property = g_strdup("python /usr/bin/tintwizard.py");
+       g_cmd_property = g_strconcat( "python ", INSTALL_PREFIX, "/bin/tintwizard.py", (void*)0 );
 
        // load config
        path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL);