[libgda] Autotools: fixed build due to file rename
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Autotools: fixed build due to file rename
- Date: Fri, 8 Feb 2019 16:40:53 +0000 (UTC)
commit d240ad477b19fec7813236c67f00bb3594f8de38
Author: Daniel Espinosa Ortiz <esodan gmail com>
Date: Fri Feb 8 09:06:26 2019 -0600
Autotools: fixed build due to file rename
configure.ac | 1 -
po/POTFILES.in | 2 +-
tools/browser/Makefile.am | 1 -
.../{gda-browser-6.0.png => org.gnome.gda.Browser.png} | Bin
.../{gda-browser-6.0.png => org.gnome.gda.Browser.png} | Bin
tools/browser/meson.build | 11 +----------
...owser.desktop.in.in => org.gnome.gda.Browser.desktop.in} | 0
7 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 753acfffb..28cf335e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1034,7 +1034,6 @@ tools/Makefile
tools/gda-sql-6.0.1:tools/gda-sql.1.in
tools/base/Makefile
tools/browser/Makefile
-tools/browser/gda-browser-$API_VERSION.desktop.in:tools/browser/gda-browser.desktop.in.in
tools/browser/canvas/Makefile
tools/browser/dummy-perspective/Makefile
tools/browser/schema-browser/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ed5bd9473..e840c7b1c 100755
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -315,7 +315,7 @@ tools/browser/login-dialog.c
tools/browser/mgr-favorites.c
tools/browser/objects-cloud.c
tools/browser/org.gnome.gda.Browser.appdata.xml.in
-tools/browser/org.gnome.gda.Browser.desktop.in.in
+tools/browser/org.gnome.gda.Browser.desktop.in
tools/browser/query-exec/perspective-main.c
tools/browser/query-exec/query-console-page.c
tools/browser/query-exec/query-editor.c
diff --git a/tools/browser/Makefile.am b/tools/browser/Makefile.am
index 7eda22f91..1412b03f6 100644
--- a/tools/browser/Makefile.am
+++ b/tools/browser/Makefile.am
@@ -105,6 +105,5 @@ EXTRA_DIST = \
DISTCLEANFILES = \
$(desktop_DATA) \
- org.gnome.gda.Browser.desktop.in \
$(metainfo_DATA)
diff --git a/tools/browser/data/256x256/gda-browser-6.0.png
b/tools/browser/data/256x256/org.gnome.gda.Browser.png
similarity index 100%
rename from tools/browser/data/256x256/gda-browser-6.0.png
rename to tools/browser/data/256x256/org.gnome.gda.Browser.png
diff --git a/tools/browser/data/48x48/gda-browser-6.0.png b/tools/browser/data/48x48/org.gnome.gda.Browser.png
similarity index 100%
rename from tools/browser/data/48x48/gda-browser-6.0.png
rename to tools/browser/data/48x48/org.gnome.gda.Browser.png
diff --git a/tools/browser/meson.build b/tools/browser/meson.build
index 5a733d7b4..207393359 100644
--- a/tools/browser/meson.build
+++ b/tools/browser/meson.build
@@ -78,19 +78,10 @@ gda_browser_sources += gda_browser_sourcesf
subdir('data')
-desktopf = files(['org.gnome.gda.Browser.desktop.in.in'])
-desktopconf = configuration_data()
-desktopconf.set('GDA_VERSION', project_version)
-desktopfin = configure_file(
- input: 'org.gnome.gda.Browser.desktop.in.in',
- output: 'org.gnome.gda.Browser.desktop.in',
- configuration: desktopconf
- )
-
i18n.merge_file('browser_desktop',
po_dir: join_paths(meson.source_root(),'po'),
type: 'desktop',
- input: desktopfin,
+ input: 'org.gnome.gda.Browser.desktop.in',
output: 'org.gnome.gda.Browser.desktop',
install: true,
install_dir: join_paths(get_option('datadir'),'applications')
diff --git a/tools/browser/org.gnome.gda.Browser.desktop.in.in
b/tools/browser/org.gnome.gda.Browser.desktop.in
similarity index 100%
rename from tools/browser/org.gnome.gda.Browser.desktop.in.in
rename to tools/browser/org.gnome.gda.Browser.desktop.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]