unit: introduce ConditionFileIsExecutable= and use it where we check for a binary...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca2c43773aa05ec08eb4d6cd69749657787ae9be..2e31c8dde81f27a540266fd89261254fdcea2555 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -411,7 +411,6 @@ EXTRA_DIST = \
         units/user@.service.in \
        systemd.pc.in \
        introspect.awk \
-       src/org.freedesktop.systemd1.policy.in \
         src/73-seat-late.rules.in
 
 if ENABLE_BINFMT
@@ -438,6 +437,12 @@ dist_systemunit_DATA += \
        units/frugalware/display-manager.service
 endif
 
+if TARGET_SUSE
+dist_systemunit_DATA += \
+       units/suse/rc-local.service \
+       units/suse/halt-local.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
        units/plymouth-start.service \
@@ -469,17 +474,26 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-nodist_polkitpolicy_DATA = \
-       src/org.freedesktop.systemd1.policy
-
-dist_polkitpolicy_in_files = \
+# Passed through intltool only
+polkitpolicy_in_files = \
         src/org.freedesktop.hostname1.policy.in \
         src/org.freedesktop.locale1.policy.in \
         src/org.freedesktop.timedate1.policy.in \
         src/org.freedesktop.login1.policy.in
 
+# First passed through sed, followed by intltool
+polkitpolicy_in_in_files = \
+       src/org.freedesktop.systemd1.policy.in.in
+
+nodist_polkitpolicy_DATA = \
+        $(polkitpolicy_in_files:.policy.in=.policy) \
+        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+
+EXTRA_DIST += \
+        $(polkitpolicy_in_files) \
+        $(polkitpolicy_in_in_files)
+
 @INTLTOOL_POLICY_RULE@
-polkitpolicy_DATA = $(dist_polkitpolicy_in_files:.policy.in=.policy)
 
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
@@ -602,7 +616,17 @@ EXTRA_DIST += \
        src/shutdownd.h \
        src/umount.h \
        src/readahead-common.h \
-       src/ask-password-api.h
+       src/ask-password-api.h \
+        src/pager.h \
+        src/sysfs-show.h \
+        src/polkit.h \
+        src/logind.h \
+        src/logind-device.h \
+        src/logind-seat.h \
+        src/logind-session.h \
+        src/logind-user.h \
+        src/logind-acl.h \
+        src/dbus-loop.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -1341,7 +1365,7 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
-src/%.policy: src/%.policy.in Makefile
+src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)
 
 src/%.rules: src/%.rules.in Makefile
@@ -1367,8 +1391,8 @@ CLEANFILES = \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
-       $(polkitpolicy_DATA) \
-       src/org.freedesktop.systemd1.policy
+       $(nodist_polkitpolicy_DATA) \
+        src/73-seat-late.rules
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1704,6 +1728,19 @@ if TARGET_DEBIAN_OR_UBUNTU
                $(LN_S) multi-user.target runlevel5.target )
 endif
 
+if TARGET_SUSE
+       $(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) && \
+               rm -f local.service && \
+               $(LN_S) rc-local.service local.service )
+       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+               rm -f halt-local.service && \
+               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+endif
+
 if HAVE_SYSV_COMPAT
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f var-lock.mount && \