[gimp/soc-2011-seamless-clone2] Bug 694201 - gimptool: update to follow new user directory scheme.



commit 9639053846ae9ed97ae57caf4cc9373a7444a067
Author: Jehan <jehan girinstud io>
Date:   Wed Feb 20 03:34:01 2013 +0900

    Bug 694201 - gimptool: update to follow new user directory scheme.

 tools/Makefile.am |    3 +++
 tools/gimptool.c  |    6 ++----
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6128f57..e78621e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,5 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
+libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
+
 if WITH_PDBGEN
 D_pdbgen = pdbgen
 else
@@ -19,6 +21,7 @@ gimptool_2_0_SOURCES = \
        gimptool.c
 
 gimptool_2_0_LDADD = \
+       $(libgimpbase)                  \
        $(GTK_LIBS)
 
 kernelgen_SOURCES = kernelgen.c
diff --git a/tools/gimptool.c b/tools/gimptool.c
index 26991e5..cb50031 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -528,8 +528,7 @@ do_build_nogimpui (const gchar *what)
 static gchar *
 get_user_plugin_dir (void)
 {
-  return g_build_filename (g_get_home_dir (),
-                           GIMPDIR,
+  return g_build_filename (gimp_directory (),
                            "plug-ins",
                            NULL);
 }
@@ -644,8 +643,7 @@ do_uninstall_admin_bin (const gchar *what)
 static gchar *
 get_user_script_dir (void)
 {
-  return g_build_filename (g_get_home_dir (),
-                           GIMPDIR,
+  return g_build_filename (gimp_directory (),
                            "scripts",
                            NULL);
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]