manager: merge /etc/xdg/systemd/session and /etc/systemd/session

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ebcdedd4fc5f061f5c28525b7e234fb38c057248..26a2c95850387bb7157d116159c5dc7e81860737 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
 
 #      -DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
-
+VALA_CFLAGS=-Wno-unused-variable -Wno-unused-function
 
 sbin_PROGRAMS = \
        systemd
@@ -80,7 +80,9 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-initctl.socket \
        units/systemd-logger.service.in \
-       units/systemd-logger.socket
+       units/systemd-logger.socket \
+       LICENSE \
+       README
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
@@ -222,14 +224,14 @@ systemctl_SOURCES = \
        systemctl.vala \
        systemd-interfaces.vala
 
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS)
+systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
 systemctl_LDADD = $(DBUSGLIB_LIBS)
 
 systemadm_SOURCES = \
        systemadm.vala \
        systemd-interfaces.vala
 
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
+systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 systemd-initctl.service: units/systemd-initctl.service.in Makefile
@@ -248,3 +250,8 @@ CLEANFILES = \
        systemadm.c \
        systemd-initctl.service \
        systemd-logger.service
+
+install-data-hook:
+       $(MKDIR_P) $(DESTDIR)$(pkgsysconfdir)/system $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd
+       rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+       ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session