X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=2ab7995025245aca356f3b886206b7bc6bd52691;hb=1f48cf56cb2693b84fdc76dc8df0b048ed50ef43;hp=5f880afe0045be08336c09f36474bd39b456152f;hpb=8c4a3079a7f358c179430d1aec59de8b670b5f6e;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 5f880afe0..2ab799502 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,6 @@ sessionunitdir=$(pkgdatadir)/session
 
 # And these are the special ones for /
 rootdir=@rootdir@
-rootsbindir=$(rootdir)/sbin
 rootbindir=$(rootdir)/bin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
@@ -42,13 +41,11 @@ AM_CPPFLAGS = \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(rootsbindir)/systemd\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
 	-I $(top_srcdir)/src
 
-rootsbin_PROGRAMS = \
-	systemd
-
 rootbin_PROGRAMS = \
+	systemd \
 	systemctl
 
 if HAVE_GTK
@@ -162,6 +159,13 @@ dist_systemunit_DATA += \
 	units/fedora/sysinit.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 \
@@ -364,11 +368,10 @@ systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
-		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+	$(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
 		-e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
 		-e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
-		-e 's,@SYSTEMCTL\@,$(bindir)/systemctl,g' \
+		-e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
 		< $< > $@
 
 units/%: units/%.in Makefile