[libgda/LIBGDA_4.2] Reports: Do not install sub-directories in /usr/bin Bug # 594115

[Murray Cumming <murrayc src gnome org>]

commit a158000d4c559720d7e53259ab08acbda82130fa
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Jun 16 14:03:52 2011 +0200

    Reports: Do not install sub-directories in /usr/bin
    Bug # 594115

 libgda-report/RML/gda-report-rml-document.c |    4 ++--
 libgda-report/RML/trml2html/Makefile.am     |    4 ++--
 libgda-report/RML/trml2pdf/Makefile.am      |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/libgda-report/RML/gda-report-rml-document.c b/libgda-report/RML/gda-report-rml-document.c
index 620c46f..d390a07 100644
--- a/libgda-report/RML/gda-report-rml-document.c
+++ b/libgda-report/RML/gda-report-rml-document.c
@@ -198,7 +198,7 @@ gda_report_rml_document_run_as_html (GdaReportDocument *doc, const gchar *filena
 	if (!converter) {
 		converter = g_find_program_in_path ("trml2html.py");
 		if (!converter) {
-			converter = gda_gbr_get_file_path (GDA_BIN_DIR, "gda_trml2html", "trml2html.py", NULL);
+			converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2html", "trml2html.py", NULL);
 			if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
 				g_free (converter);
 				converter = NULL;
@@ -229,7 +229,7 @@ gda_report_rml_document_run_as_pdf (GdaReportDocument *doc, const gchar *filenam
 	if (!converter) {
 		converter = g_find_program_in_path ("trml2pdf.py");
 		if (!converter) {
-			converter = gda_gbr_get_file_path (GDA_BIN_DIR, "gda_trml2pdf", "trml2pdf.py", NULL);
+			converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2pdf", "trml2pdf.py", NULL);
 			if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
 				g_free (converter);
 				converter = NULL;
diff --git a/libgda-report/RML/trml2html/Makefile.am b/libgda-report/RML/trml2html/Makefile.am
index 42a66b6..70708d6 100644
--- a/libgda-report/RML/trml2html/Makefile.am
+++ b/libgda-report/RML/trml2html/Makefile.am
@@ -1,7 +1,7 @@
 trml2html_SCRIPTS = trml2html.py
 trml2html_DATA = __init__.py utils.py
-trml2htmldir = $(bindir)/gda_trml2html
+trml2htmldir = $(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/gda_trml2html
 
 EXTRA_DIST = \
 	$(trml2html_SCRIPTS) \
-	$(trml2html_DATA)
\ No newline at end of file
+	$(trml2html_DATA)
diff --git a/libgda-report/RML/trml2pdf/Makefile.am b/libgda-report/RML/trml2pdf/Makefile.am
index fa1f868..e655aac 100644
--- a/libgda-report/RML/trml2pdf/Makefile.am
+++ b/libgda-report/RML/trml2pdf/Makefile.am
@@ -1,7 +1,7 @@
 trml2pdf_SCRIPTS = trml2pdf.py
 trml2pdf_DATA = __init__.py color.py utils.py
-trml2pdfdir = $(bindir)/gda_trml2pdf
+trml2pdfdir = $(datadir)/libgda-$(GDA_ABI_MAJOR_VERSION).$(GDA_ABI_MINOR_VERSION)/gda_trml2pdf
 
 EXTRA_DIST = \
 	$(trml2pdf_SCRIPTS) \
-	$(trml2pdf_DATA)
\ No newline at end of file
+	$(trml2pdf_DATA)