tmpfiles.d: switch to stacked config dirs in /lib, /etc, /run

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 26412ab304f5a3c4f440786315f672f2de83e74d..d6182f1b7a86c0722c47432fc35f748fb2ee6253 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,7 +31,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
-tmpfilesdir=$(sysconfdir)/tmpfiles.d
+tmpfilesdir=$(prefix)/lib/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 
 # And these are the special ones for /
@@ -90,6 +90,12 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_MEEGO
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
@@ -98,6 +104,7 @@ endif
 endif
 endif
 endif
+endif
 
 rootbin_PROGRAMS = \
        systemd \
@@ -1279,8 +1286,12 @@ CLEANFILES += \
 install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
+               $(DESTDIR)$(sysconfdir)/tmpfiles.d \
+               $(DESTDIR)$(prefix)/lib/modules-load.d \
                $(DESTDIR)$(sysconfdir)/modules-load.d \
+               $(DESTDIR)$(prefix)/lib/sysctl.d \
                $(DESTDIR)$(sysconfdir)/sysctl.d \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
                $(DESTDIR)$(sysconfdir)/binfmt.d \
                $(DESTDIR)$(systemshutdowndir) \
                $(DESTDIR)$(systemgeneratordir) \
@@ -1454,6 +1465,20 @@ if HAVE_PLYMOUTH
                rm -f plymouth-halt.service && \
                $(LN_S) ../plymouth-halt.service plymouth-halt.service )
 endif
+if TARGET_MEEGO
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f network.target && \
+               $(LN_S) $(systemunitdir)/network.target network.target )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+               rm -f * )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
+               rm -f * )
+endif
 
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants