SF.net SVN: geany-plugins:[1382] trunk/geany-plugins/geanygendoc

[colombanw at users.sourceforge.net]

Revision: 1382
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1382&view=rev
Author:   colombanw
Date:     2010-05-22 22:34:05 +0000 (Sat, 22 May 2010)

Log Message:
-----------
GeanyGenDoc: Temporary hackish fix for data installation

Manually work around the approximation of $(datadir). Should probably
still be fixed.

Modified Paths:
--------------
    trunk/geany-plugins/geanygendoc/ChangeLog
    trunk/geany-plugins/geanygendoc/Makefile.am
    trunk/geany-plugins/geanygendoc/data/filetypes/Makefile.am
    trunk/geany-plugins/geanygendoc/src/ggd-utils.c

Modified: trunk/geany-plugins/geanygendoc/ChangeLog
===================================================================
--- trunk/geany-plugins/geanygendoc/ChangeLog	2010-05-22 21:43:18 UTC (rev 1381)
+++ trunk/geany-plugins/geanygendoc/ChangeLog	2010-05-22 22:34:05 UTC (rev 1382)
@@ -7,6 +7,8 @@
     Add an entry in the TODO-list
   * [All]
     Import into Geany-Plugins.
+  * ChangeLog, Makefile.am, data/filetypes/Makefile.am, src/ggd-utils.c:
+    Temporary hackish fix for data installation.
 
 
 2010-05-21  Colomban Wendling  <ban(at)herbesfolles(dot)org>

Modified: trunk/geany-plugins/geanygendoc/Makefile.am
===================================================================
--- trunk/geany-plugins/geanygendoc/Makefile.am	2010-05-22 21:43:18 UTC (rev 1381)
+++ trunk/geany-plugins/geanygendoc/Makefile.am	2010-05-22 22:34:05 UTC (rev 1382)
@@ -5,7 +5,5 @@
 EXTRA_DIST = $(AUXFILES)
 endif
 
-SUBDIRS = src docs
-# don't install data because it doesn't work for now
-#SUBDIRS += data
+SUBDIRS = src docs data
 plugin = geanygendoc

Modified: trunk/geany-plugins/geanygendoc/data/filetypes/Makefile.am
===================================================================
--- trunk/geany-plugins/geanygendoc/data/filetypes/Makefile.am	2010-05-22 21:43:18 UTC (rev 1381)
+++ trunk/geany-plugins/geanygendoc/data/filetypes/Makefile.am	2010-05-22 22:34:05 UTC (rev 1382)
@@ -1,5 +1,7 @@
 if ENABLE_GEANYGENDOC
 plugin = geanygendoc
+# FIXME: should probably done by an included .mk such as vars.data.mk
+plugindatadir = $(datadir)/geany-plugins/$(plugin)
 endif
 
 FILETYPES = c.conf \

Modified: trunk/geany-plugins/geanygendoc/src/ggd-utils.c
===================================================================
--- trunk/geany-plugins/geanygendoc/src/ggd-utils.c	2010-05-22 21:43:18 UTC (rev 1381)
+++ trunk/geany-plugins/geanygendoc/src/ggd-utils.c	2010-05-22 22:34:05 UTC (rev 1382)
@@ -153,8 +153,10 @@
   
   user_dir = g_build_filename (G_DIR_SEPARATOR_S, geany->app->configdir,
                                "plugins", GGD_PLUGIN_CNAME, section, NULL);
-  system_dir = g_build_filename (G_DIR_SEPARATOR_S, geany->app->datadir,
-                                 "plugins", GGD_PLUGIN_CNAME, section, NULL);
+  /* FIXME: this should probably be fixed together with the build system not
+   *        to need to explicitly add the "geany-plugins" part */
+  system_dir = g_build_filename (DATADIR, "geany-plugins", GGD_PLUGIN_CNAME,
+                                 section, NULL);
   user_path = g_build_filename (user_dir, name, NULL);
   system_path = g_build_filename (system_dir, name, NULL);
   if (perms_req & GGD_PERM_R) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.