sysctl.d, binfmt.d, modules-load.d: switch to stacked config dirs in /lib, /etc,...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 26412ab304f5a3c4f440786315f672f2de83e74d..b4644fa75e7cd6b5c2d64c1f1f6ecfb3cb4776c2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
@@ -1280,8 +1287,11 @@ install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
                $(DESTDIR)$(sysconfdir)/modules-load.d \
+               $(DESTDIR)$(prefix)/lib/modules-load.d \
                $(DESTDIR)$(sysconfdir)/sysctl.d \
+               $(DESTDIR)$(prefix)/lib/sysctl.d \
                $(DESTDIR)$(sysconfdir)/binfmt.d \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
                $(DESTDIR)$(systemshutdowndir) \
                $(DESTDIR)$(systemgeneratordir) \
                $(DESTDIR)$(usergeneratordir)
@@ -1454,6 +1464,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