[libgda] Fixed gda-sql help install
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Fixed gda-sql help install
- Date: Wed, 5 Feb 2014 20:58:14 +0000 (UTC)
commit 0bb31b3f95f7e458548f13f6dcd3c1cebf2f3ca7
Author: Vivien Malerba <malerba gnome-db org>
Date: Wed Feb 5 21:42:01 2014 +0100
Fixed gda-sql help install
configure.ac | 1 +
tools/cmdtool/tool-help.c | 3 +--
tools/help/C/Makefile.am | 6 ++++++
tools/help/Makefile.am | 10 +---------
4 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2fcfe02..201aeb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1014,6 +1014,7 @@ tools/Makefile
tools/gda-sql-5.0.1:tools/gda-sql.1.in
tools/cmdtool/Makefile
tools/help/Makefile
+tools/help/C/Makefile
tools/browser/Makefile
tools/browser/data/Makefile
tools/browser/common/Makefile
diff --git a/tools/cmdtool/tool-help.c b/tools/cmdtool/tool-help.c
index c4844d8..60cd3d8 100644
--- a/tools/cmdtool/tool-help.c
+++ b/tools/cmdtool/tool-help.c
@@ -373,8 +373,7 @@ load_help_doc (void)
const gchar * const *langs = g_get_language_names ();
gchar *dirname, *helpfile;
gint i;
- dirname = gda_gbr_get_file_path (GDA_DATA_DIR, "gnome", "help",
- "gda-sql", NULL);
+ dirname = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda-sql", "help", NULL);
for (i = 0; langs[i]; i++) {
helpfile = g_build_filename (dirname, langs[i], "gda-sql-help.xml", NULL);
if (g_file_test (helpfile, G_FILE_TEST_EXISTS))
diff --git a/tools/help/C/Makefile.am b/tools/help/C/Makefile.am
new file mode 100644
index 0000000..f806fb8
--- /dev/null
+++ b/tools/help/C/Makefile.am
@@ -0,0 +1,6 @@
+helpdir = $(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/gda-sql/help/C
+help_DATA = \
+ gda-sql-help.xml
+
+EXTRA_DIST = \
+ $(help_DATA)
diff --git a/tools/help/Makefile.am b/tools/help/Makefile.am
index 2ace9d0..42ffacc 100644
--- a/tools/help/Makefile.am
+++ b/tools/help/Makefile.am
@@ -1,9 +1 @@
- YELP_HELP_RULES@
-
-DOC_ID = gda-sql
-DOC_NOCHECK = yes
-
-DOC_PAGES = \
- gda-sql-help.xml
-
-DOC_LINGUAS =
+SUBDIRS = C
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]