[systemd-commits] 2 commits - Makefile.am

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 3864c28549d742427fdf33026e522e9f10a7e4ec
Author: Jon Severinsson <jon at severinsson.net>
Date:   Fri Jul 11 14:37:36 2014 +0200

    build-sys: Do not distribute generated emergency.service
    
    It is already in nodist_systemunit_DATA and if it is
    shipped, it contains the hardcoded path to systemctl
    which will cause it to fail to start when
    rootprefix != prefix and rootbindir != bindir.

diff --git a/Makefile.am b/Makefile.am
index 220e99e..2b1484f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -412,7 +412,6 @@ dist_sysctl_DATA = \
 dist_systemunit_DATA = \
 	units/graphical.target \
 	units/multi-user.target \
-	units/emergency.service \
 	units/emergency.target \
 	units/sysinit.target \
 	units/basic.target \

commit 3ce142490907d31c33ac03d72554f92459192f92
Author: Mike Gilbert <floppym at gentoo.org>
Date:   Fri Jul 4 14:43:14 2014 -0400

    Revert "build-sys: include PolicyKit files as part of distribution"
    
    This reverts commit 0c26bfc3d21fdb3963f1248c237e2f1a33b5566d.
    
    src/core/org.freedesktop.systemd1.policy.in.in depends on values which
    are specified at configure time, so we cannot ship the corresponding
    policy file in the tarball.
    
    Since we need to regenerate one policy file, we might as well generate
    them all.

diff --git a/Makefile.am b/Makefile.am
index bb8fc47..220e99e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5281,7 +5281,7 @@ units/user/%: units/%.m4
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
-dist_polkitpolicy_DATA = \
+nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
 endif