[gtk+] build: Drop redundant workaround
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] build: Drop redundant workaround
- Date: Tue, 10 Oct 2017 11:16:29 +0000 (UTC)
commit 7e8f2f61788e112e8c0998fae036c59f388f12df
Author: Timm Bäder <mail baedert org>
Date: Tue Oct 10 12:53:06 2017 +0200
build: Drop redundant workaround
This is fixed and we require a meson > 0.39 anyway.
gtk/meson.build | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 202e032..36a9ceb 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -671,15 +671,11 @@ if not (x11_enabled or win32_enabled or quartz_enabled)
endif
gen_gtk_gresources_xml = find_program('gen-gtk-gresources-xml.py')
-# FIXME: absolute path to work around meson bug with @OUTPUT@ etc. not being
-# handled here, and also with the working dir from which the script is called.
-# Hopefully all to be fixed in Meson 0.39
-outfile = '@0@/gtk.gresources.xml'.format(meson.current_build_dir())
gtk_gresources_xml = configure_file(output: 'gtk.gresources.xml',
command: [
gen_gtk_gresources_xml,
meson.current_source_dir(),
- outfile
+ '@OUTPUT@'
])
# Re-build the theme files if sassc is available
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]