From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 5 Jun 2010 06:03:15 +0000 (+0200)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 0.git+20100605+dfd8ee-1~9^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aa3df795bcccabab9ff82d8ff8a00cb7b39049b;p=systemd

Merge remote branch 'origin/master'
---

6aa3df795bcccabab9ff82d8ff8a00cb7b39049b
diff --cc Makefile.am
index 53f485e0,28e52fee..a1c08364
--- a/Makefile.am
+++ b/Makefile.am
@@@ -155,14 -159,14 +159,21 @@@ dist_systemunit_DATA += 
  	units/fedora/reboot.service \
  	units/fedora/sysinit.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_SUSE
+ dist_systemunit_DATA += \
+ 	units/suse/halt.service \
+ 	units/suse/poweroff.service \
+ 	units/suse/reboot.service
+ endif
+ 
  if TARGET_GENTOO
  dist_systemunit_DATA += \
  	units/gentoo/halt.service \