summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-18 14:30:37 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2018-10-18 14:51:57 +0200
commitc304510ca53626d068c1672beb35d29988a41029 (patch)
tree28017a66c4dcf379b2f59e21c6d884d41cec9272
parent8d4af0bff6bb8951a37f6d2bac96ba05fe2c4156 (diff)
meson: we accidently looked at the wrong elementary config spot
we read and wrote the config into the wrong subdirectory, thus values did not match - HOWEVER something lead to more problems and trouble, as some options in elementary_config are not respected anymore. Differential Revision: https://phab.enlightenment.org/D7175
-rw-r--r--src/lib/elementary/meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 69f48f3cda..0c4c324ea5 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -881,7 +881,7 @@ elm_options = configuration_data()
881 881
882config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root()) 882config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root())
883config_h.set_quoted('MODULES_PATH', join_paths(dir_lib, 'modules')) 883config_h.set_quoted('MODULES_PATH', join_paths(dir_lib, 'modules'))
884config_h.set_quoted('ELEMENTARY_BASE_DIR', '.data') 884config_h.set_quoted('ELEMENTARY_BASE_DIR', '.elementary')
885config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons')) 885config_h.set_quoted('ICON_DIR', join_paths(dir_lib, 'icons'))
886 886
887elm_options.set('ELM_UNIX', '1') 887elm_options.set('ELM_UNIX', '1')