hostname: unify hostname configuration file parsers a little

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7afa2f1576c5df099b868442e545c755ee783194..c98ad0b8b956d89a70fdab6e3a21d5e59c8aad2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,7 @@ EXTRA_DIST = \
        units/systemd-logger.service.in \
        units/systemd-logger.socket
 
-BASIC_SOURCES= \
+BASIC_SOURCES = \
         util.c \
         util.h \
         hashmap.c \
@@ -95,7 +95,7 @@ BASIC_SOURCES= \
         ratelimit.c \
         ratelimit.h
 
-COMMON_SOURCES= \
+COMMON_SOURCES = \
        $(BASIC_SOURCES) \
        unit.c \
        unit.h \
@@ -229,7 +229,7 @@ systemd_cgroups_agent_CPPFLAGS = \
 systemd_cgroups_agent_LDADD = \
        $(DBUS_LIBS)
 
-VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gee-1.0 --pkg gtk+-2.0
+VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gtk+-2.0
 
 systemctl_SOURCES = \
        systemctl.vala \
@@ -246,10 +246,14 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile
-       sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+       sed -e 's,@libexecdir\@,$(libexecdir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@
 
 systemd-logger.service: units/systemd-logger.service.in Makefile
-       sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+       sed -e 's,@libexecdir\@,$(libexecdir),g' \
+               -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+               < $< > $@
 
 CLEANFILES = \
        systemd-interfaces.c \