aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2011-06-24 15:42:53 +0100
committerJavier Jardón <javier.jardon@codethink.co.uk>2011-06-24 15:42:53 +0100
commit05c42721a5838b7408412270e79c810caff9069d (patch)
treec3399f1687cf05d2a039157a083b168f8a160ca9
parente2d0b048d348a415ad97298489af6d706a773c54 (diff)
downloadayatana-indicator-power-05c42721a5838b7408412270e79c810caff9069d.tar.gz
ayatana-indicator-power-05c42721a5838b7408412270e79c810caff9069d.tar.bz2
ayatana-indicator-power-05c42721a5838b7408412270e79c810caff9069d.zip
Some build fixes
-rw-r--r--Makefile.am9
-rw-r--r--src/power-service.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am
index 044881e..3d9a8b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,11 +6,11 @@ SUBDIRS = po
# DBus service file
dbus_servicesdir = $(DBUSSERVICEDIR)
-dbus_services_DATA = indicator-power.service
+dbus_services_DATA = data/indicator-power.service
# Rule to make the service file with libexecdir expanded
%.service: %.service.in
- sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
############################################################
@@ -23,7 +23,7 @@ libexec_PROGRAMS = indicator-power-service
powerlibdir = $(INDICATORDIR)
powerlib_LTLIBRARIES = libpower.la
libpower_la_SOURCES = \
- indicator-power.c
+ src/indicator-power.c
libpower_la_CFLAGS = \
$(INDICATOR_CFLAGS) \
-Wall -Werror \
@@ -39,10 +39,11 @@ libpower_la_LDFLAGS = \
################
indicator_power_service_SOURCES = \
- power-service.c
+ src/power-service.c
indicator_power_service_CFLAGS = \
$(POWERSERVICE_CFLAGS) \
-Wall -Werror \
+ -DLOCALEDIR=\"$(localedir)\" \
-DG_LOG_DOMAIN=\"Power-Me\"
indicator_power_service_LDADD = \
$(POWERSERVICE_LIBS)
diff --git a/src/power-service.c b/src/power-service.c
index 909b29b..7e1ca1e 100644
--- a/src/power-service.c
+++ b/src/power-service.c
@@ -42,7 +42,7 @@ main (gint argc,
g_type_init();
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
setlocale (LC_ALL, "");