nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@490 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
Andreas.Fink85 2010-06-12 21:21:06 +00:00
parent 771d0bf4ea
commit 20a48674c9
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -57,7 +57,7 @@ if( ENABLE_BATTERY )
endif( ENABLE_BATTERY ) endif( ENABLE_BATTERY )
if( ENABLE_TINT2CONF ) if( ENABLE_TINT2CONF )
add_definitions( -DBUILD_CMAKE ) add_definitions( -DHAVE_VERSION_H )
add_subdirectory( src/tint2conf ) add_subdirectory( src/tint2conf )
add_dependencies( tint2conf version ) add_dependencies( tint2conf version )
endif( ENABLE_TINT2CONF ) endif( ENABLE_TINT2CONF )

1
src/tint2conf/CMakeLists.txt
View file

@ -28,6 +28,7 @@ target_link_libraries( tint2conf ${X11_LIBRARIES}
${GTHREAD2_LIBRARIES} ${GTHREAD2_LIBRARIES}
${GTK2_LIBRARIES} ) ${GTK2_LIBRARIES} )
add_definitions( -DINSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\" )
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) #set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed)

6
src/tint2conf/main.c
View file

@ -28,10 +28,8 @@
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#ifdef BUILD_CMAKE #ifdef HAVE_VERSION_H
#include "version.h" #include "version.h"
#else
#include "../version.h"
#endif #endif
#include "common.h" #include "common.h"
#include "theme_view.h" #include "theme_view.h"
@ -581,7 +579,7 @@ void read_config()
} }
g_width = 500; g_width = 500;
g_height = 350; 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 // load config
path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL); path = g_build_filename (g_get_user_config_dir(), "tint2", "tint2confrc", NULL);