[grisbi-cvs] grisbi/src Makefile.am, 1.166, 1.167 main.c, 1.174, 1.175 parse_cmdline.c, 1.17, 1.18

[Pierre Biava]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv23021/src

Modified Files:
	Makefile.am main.c parse_cmdline.c 
Log Message:
amendment to the path management of libraries for x86_64 architecture

Index: parse_cmdline.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/parse_cmdline.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- parse_cmdline.c	24 Apr 2010 18:38:27 -0000	1.17
+++ parse_cmdline.c	28 Apr 2010 16:19:58 -0000	1.18
@@ -166,7 +166,7 @@
 void show_version(void)
 {
 #ifdef HAVE_PLUGINS
-    gsb_plugins_scan_dir ( PLUGINS_DIRECTORY );
+    gsb_plugins_scan_dir ( PLUGINS_DIR );
 #endif
 
     g_print(N_("Grisbi version %s, %s\n"), VERSION, gsb_plugin_get_list());

Index: Makefile.am
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/Makefile.am,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- Makefile.am	18 Apr 2010 14:48:46 -0000	1.166
+++ Makefile.am	28 Apr 2010 16:19:58 -0000	1.167
@@ -1,13 +1,15 @@
 # Process this file with automake to produce Makefile.in
 
 localedir = $(datadir)/locale
-AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(prefix)/lib/@PACKAGE@\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(datadir)/doc/@PACKAGE@\"" -Wall
+AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(libdir)/@PACKAGE@\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(datadir)/doc/@PACKAGE@\"" -Wall
 bin_PROGRAMS = grisbi
 
 # TODO: This manual setting of -Wl is a hack, I cannot get it from
 # configure right now because of no doc.
 grisbi_LDFLAGS = @lt_prog_compiler_wl@@export_dynamic_flag_spec@
 
+grisbi_LDADD = $(GTK_LIBS)
+
 config_dir = config
 
 sources = \

Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- main.c	27 Apr 2010 16:58:40 -0000	1.174
+++ main.c	28 Apr 2010 16:19:58 -0000	1.175
@@ -117,28 +117,9 @@
     struct sigaction sig_sev;
 #endif
 #ifdef _MSC_VER
-	gchar *gtkrc_file;
-#endif
-
-#ifdef G_OS_UNIX
-    if ( g_file_test ( PLUGINS_DIR, G_FILE_TEST_IS_DIR ) )
-        PLUGINS_DIRECTORY = g_strdup ( PLUGINS_DIR );
-
-    else
-    {
-        gchar *ptr;
-        gchar *dir_name;
-
-        ptr = g_strrstr ( PLUGINS_DIR, "/grisbi" );
-        dir_name = g_strndup ( PLUGINS_DIR, ( ptr - PLUGINS_DIR ) );
-        dir_name = g_strconcat ( dir_name, "64/grisbi", NULL );
-        
-        if ( g_file_test ( dir_name, G_FILE_TEST_IS_DIR ) )
-            PLUGINS_DIRECTORY = dir_name;
-    }
+	gchar * gtkrc_file;
 #endif
 
-
 #if GSB_GMEMPROFILE
     g_mem_set_vtable(glib_mem_profiler_table);
 #endif
@@ -195,7 +176,7 @@
     }
 
 #ifdef HAVE_PLUGINS
-    gsb_plugins_scan_dir ( PLUGINS_DIRECTORY );
+    gsb_plugins_scan_dir ( PLUGINS_DIR );
 #endif
 
     /* create the icon of grisbi (set in the panel of gnome or other) */
@@ -345,7 +326,6 @@
     gtk_main ();
 
     gsb_plugins_release ( );
-    g_free ( PLUGINS_DIRECTORY );
 
     /* sauvegarde les raccourcis claviers */
     gtk_accel_map_save (path);