From 1eac66f4aa7b818bf41936659830721ed5e59d18 Mon Sep 17 00:00:00 2001 From: John Hiesey Date: Fri, 11 Oct 2013 17:21:42 -0700 Subject: Look for personality file in /etc/EndlessOS The personality file is moving to /etc/EndlessOS/personality.txt for OSTree, since /usr/share is read-only. [endlessm/eos-shell#1157] --- endless/Makefile.am | 3 ++- endless/eosinit.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'endless') diff --git a/endless/Makefile.am b/endless/Makefile.am index afde83f..3a5b95c 100644 --- a/endless/Makefile.am +++ b/endless/Makefile.am @@ -64,7 +64,8 @@ libendless_@EOS_SDK_API_VERSION@_la_CPPFLAGS = \ @EOS_SDK_CFLAGS@ \ -DG_LOG_DOMAIN=\"EndlessSDK\" \ -DCOMPILING_EOS_SDK \ - -DDATADIR=\""$(datadir)"\" + -DDATADIR=\""$(datadir)"\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" libendless_@EOS_SDK_API_VERSION@_la_CFLAGS = $(AM_CFLAGS) libendless_@EOS_SDK_API_VERSION@_la_LIBADD = @EOS_SDK_LIBS@ libendless_@EOS_SDK_API_VERSION@_la_LDFLAGS = \ diff --git a/endless/eosinit.c b/endless/eosinit.c index 4edcbf0..1d0a7a1 100644 --- a/endless/eosinit.c +++ b/endless/eosinit.c @@ -84,7 +84,7 @@ eos_get_system_personality (void) if (tmp == NULL) { - char *path = g_build_filename (DATADIR, + char *path = g_build_filename (SYSCONFDIR, "EndlessOS", "personality.txt", NULL); -- cgit v1.2.3