locale: initialize locale from /etc/locale by default

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ee8ff4028c08c8d3e4179f63549b6e5594339484..7632e553d8f7f2d981b4264578effe1d6a7ade46 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,8 @@ rootlibexec_PROGRAMS = \
        systemd-shutdownd \
        systemd-modules-load \
        systemd-remount-api-vfs \
-       systemd-kmsg-syslogd
+       systemd-kmsg-syslogd \
+       systemd-vconsole-setup
 
 noinst_PROGRAMS = \
        test-engine \
@@ -129,6 +130,7 @@ dist_systemunit_DATA = \
        units/network.target \
        units/nss-lookup.target \
        units/mail-transfer-agent.target \
+       units/http-daemon.target \
        units/poweroff.target \
        units/reboot.target \
        units/rescue.target \
@@ -179,6 +181,7 @@ nodist_systemunit_DATA = \
        units/systemd-shutdownd.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
+       units/systemd-vconsole-setup.service \
        units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
@@ -205,6 +208,7 @@ EXTRA_DIST = \
        units/systemd-shutdownd.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
+       units/systemd-vconsole-setup.service.in \
        units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
@@ -235,7 +239,11 @@ dist_systemunit_DATA += \
        units/debian/halt.service \
        units/debian/killall.service \
        units/debian/poweroff.service \
-       units/debian/reboot.service
+       units/debian/reboot.service \
+       units/debian/fsck.target \
+       units/debian/umountfs.service \
+       units/debian/umountnfs.service \
+       units/debian/umountroot.service
 endif
 
 if TARGET_SUSE
@@ -335,6 +343,7 @@ libsystemd_core_la_SOURCES = \
        src/hostname-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
+       src/locale-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -589,6 +598,15 @@ systemd_modules_load_CFLAGS = \
 systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
+systemd_vconsole_setup_SOURCES = \
+       src/vconsole-setup.c
+
+systemd_vconsole_setup_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_vconsole_setup_LDADD = \
+       libsystemd-basic.la
+
 systemd_remount_api_vfs_SOURCES = \
        src/remount-api-vfs.c \
        src/mount-setup.c
@@ -960,11 +978,25 @@ if TARGET_GENTOO
                rm -f xdm.service && \
                $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
+if TARGET_DEBIAN
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/umount.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
+               rm -f umountfs.service umountnfs.service umountroot.service && \
+               $(LN_S) ../umountfs.service umountfs.service && \
+               $(LN_S) ../umountnfs.service umountnfs.service && \
+               $(LN_S) ../umountroot.service umountroot.service )
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f runlevel5.target && \
+               $(LN_S) multi-user.target runlevel5.target )
+endif
 if !TARGET_SUSE
+if !TARGET_DEBIAN
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f fsck.target && \
                $(LN_S) sysinit.target fsck.target )
 endif
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \