diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-11-08 19:44:16 +0100 |
| commit | 1e2579fdeb7608719cb28da0b5061f48ba0efc34 (patch) | |
| tree | 83352697294bd24015efdce199e8fbc3d2788f6e /Makefile.am | |
| parent | a40593a0d0d740efa387e35411e1e456a6c5aba7 (diff) | |
| parent | 4cbd9ecf45f64c3a9acc99d473fbf3be3687ae24 (diff) | |
Merge branch 'master' into journal
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e08785a8a3..58b3a63517 100644 --- a/Makefile.am +++ b/Makefile.am @@ -119,6 +119,13 @@ AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ -DKBD_SETFONT=\"/bin/setfont\" \ -DDEFAULT_FONT=\"latarcyrheb-sun16\" +else +if TARGET_MAGEIA +AM_CPPFLAGS += \ + -DKBD_LOADKEYS=\"/bin/loadkeys\" \ + -DKBD_SETFONT=\"/bin/setfont\" \ + -DDEFAULT_FONT=\"LatArCyrHeb-16\" +endif endif endif endif @@ -318,7 +325,7 @@ dbusinterface_DATA += \ endif dist_bashcompletion_DATA = \ - src/systemctl-bash-completion.sh + src/systemd-bash-completion.sh dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ @@ -546,6 +553,13 @@ dist_systemunit_DATA += \ units/suse/halt-local.service endif +if TARGET_MAGEIA +dist_systemunit_DATA += \ + units/mageia/prefdm.service \ + units/fedora/rc-local.service \ + units/fedora/halt-local.service +endif + if HAVE_PLYMOUTH dist_systemunit_DATA += \ units/plymouth-start.service \ @@ -1488,7 +1502,8 @@ systemd_stdio_bridge_LDADD = \ systemadm_SOURCES = \ src/systemadm.vala \ - src/systemd-interfaces.vala + src/systemd-interfaces.vala \ + src/wraplabel.vala systemadm_CFLAGS = \ $(AM_CFLAGS) \ @@ -1501,6 +1516,7 @@ systemadm_CFLAGS = \ systemadm_VALAFLAGS = \ --pkg=posix \ --pkg=gtk+-2.0 \ + --pkg=gee-1.0 \ -g systemadm_LDADD = \ @@ -2061,6 +2077,23 @@ if TARGET_SUSE $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) endif +if TARGET_MAGEIA + $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants + ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ + rm -f rc-local.service && \ + $(LN_S) $(systemunitdir)/rc-local.service rc-local.service ) + ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ + rm -f halt-local.service && \ + $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) + ( cd $(DESTDIR)$(systemunitdir) && \ + rm -f display-manager.service && \ + $(LN_S) prefdm.service display-manager.service && \ + $(LN_S) prefdm.service dm.service ) + ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \ + rm -f display-manager.service && \ + $(LN_S) $(systemunitdir)/display-manager.service display-manager.service ) +endif + if HAVE_SYSV_COMPAT ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ rm -f var-lock.mount && \ |