M CMakeLists.txt → CMakeLists.txt

@@ -57,7 +57,7 @@ add_definitions( -DENABLE_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 )

M src/tint2conf/CMakeLists.txt → src/tint2conf/CMakeLists.txt

@@ -28,6 +28,7 @@ ${IMLIB2_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)
 

M src/tint2conf/main.c → src/tint2conf/main.c

@@ -28,10 +28,8 @@ #include <glib.h>
 #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 @@ g_default_theme = NULL;
 	}
 	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);