ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=e622acf735c569a695501acc44d59a21048bd207
commit e622acf735c569a695501acc44d59a21048bd207 Author: Andy Williams <[email protected]> Date: Mon Feb 2 23:52:04 2015 +0000 Correctly lookup icon paths - @fix T2044. Set up elm with the appropriate compile option variables. --- elm_code/bin/Makefile.am | 3 +++ elm_code/bin/elm_code_test_main.c | 4 ++++ src/bin/Makefile.am | 2 ++ src/bin/edi_main.c | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/elm_code/bin/Makefile.am b/elm_code/bin/Makefile.am index b081d5f..0e6d5ba 100644 --- a/elm_code/bin/Makefile.am +++ b/elm_code/bin/Makefile.am @@ -3,6 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in bin_PROGRAMS = elm_code_test AM_CPPFLAGS = \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -I$(top_srcdir)/elm_code/lib/ \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DEFL_BETA_API_SUPPORT \ diff --git a/elm_code/bin/elm_code_test_main.c b/elm_code/bin/elm_code_test_main.c index 2897c3c..6888459 100644 --- a/elm_code/bin/elm_code_test_main.c +++ b/elm_code/bin/elm_code_test_main.c @@ -166,6 +166,10 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) goto end; } + /* tell elm about our app so it can figure out where to get files */ + elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); + elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); + elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); elm_app_info_set(elm_main, "elm_code_test", "images/elm_code.png"); if (!(win = elm_code_test_win_setup())) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 0a5bf9b..aa95283 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -4,6 +4,8 @@ AUTOMAKE_OPTIONS = subdir-objects bin_PROGRAMS = edi edi_build AM_CPPFLAGS = \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -I$(top_srcdir)/src/bin/ \ diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c index 9b88e01..a89750b 100644 --- a/src/bin/edi_main.c +++ b/src/bin/edi_main.c @@ -859,6 +859,10 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) project_path = argv[args]; } + /* tell elm about our app so it can figure out where to get files */ + elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR); + elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR); + elm_app_compile_data_dir_set(PACKAGE_DATA_DIR); elm_app_info_set(elm_main, "edi", "images/edi.png"); if (!project_path) --
