Revision: 1397 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1397&view=re... Author: colombanw Date: 2010-05-23 19:06:36 +0000 (Sun, 23 May 2010)

Log Message: ----------- GeanyGenDoc: Make use of the brand new PKGDATADIR

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

Modified: trunk/geany-plugins/geanygendoc/data/filetypes/Makefile.am =================================================================== --- trunk/geany-plugins/geanygendoc/data/filetypes/Makefile.am 2010-05-23 18:29:52 UTC (rev 1396) +++ trunk/geany-plugins/geanygendoc/data/filetypes/Makefile.am 2010-05-23 19:06:36 UTC (rev 1397) @@ -1,7 +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) +plugindatadir = $(pkgdatadir)/$(plugin) endif

FILETYPES = c.conf \

Modified: trunk/geany-plugins/geanygendoc/src/ggd-utils.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-utils.c 2010-05-23 18:29:52 UTC (rev 1396) +++ trunk/geany-plugins/geanygendoc/src/ggd-utils.c 2010-05-23 19:06:36 UTC (rev 1397) @@ -153,10 +153,7 @@

user_dir = g_build_filename (G_DIR_SEPARATOR_S, geany->app->configdir, "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); + system_dir = g_build_filename (PKGDATADIR, 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.