From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 20 Nov 2010 07:55:57 +0000 (+0100)
Subject: Merge commit 'v13'
X-Git-Tag: 16-1~35^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb8642d19ce24f1ce1e5f21454f28ec87b0b987d;p=systemd

Merge commit 'v13'
---

eb8642d19ce24f1ce1e5f21454f28ec87b0b987d
diff --cc Makefile.am
index 29ca9f08,e1f6fe05..0d552e51
--- a/Makefile.am
+++ b/Makefile.am
@@@ -266,40 -332,9 +332,16 @@@ dist_systemunit_DATA += 
  	units/fedora/plymouth-poweroff.service \
  	units/fedora/plymouth-halt.service
  endif
 +if TARGET_DEBIAN
 +dist_systemunit_DATA += \
 +	units/debian/halt.service \
 +	units/debian/killall.service \
 +	units/debian/poweroff.service \
 +	units/debian/reboot.service
 +endif
  
- if TARGET_DEBIAN
- dist_systemunit_DATA += \
- 	units/debian/halt.service \
- 	units/debian/killall.service \
- 	units/debian/poweroff.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
- dist_systemunit_DATA += \
- 	units/suse/halt.service \
- 	units/suse/poweroff.service \
- 	units/suse/reboot.service \
- 	units/suse/fsck.target
- endif
- 
  if TARGET_GENTOO
  dist_systemunit_DATA += \
- 	units/gentoo/halt.service \
- 	units/gentoo/killall.service \
- 	units/gentoo/poweroff.service \
- 	units/gentoo/reboot.service \
  	units/gentoo/xdm.service
  endif