From: Jeff Mahoney <jeffm@suse.com>
Date: Tue, 8 Feb 2011 17:47:32 +0000 (+0100)
Subject: plymouth: move plymouth out of TARGET_FEDORA
X-Git-Tag: v18~51
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=cd3f8b7ddb052ab5e4eab420968bae689db3899a;ds=sidebyside

plymouth: move plymouth out of TARGET_FEDORA
---

diff --git a/Makefile.am b/Makefile.am
index e796543d6..f6ad8091b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -331,14 +331,18 @@ if TARGET_FEDORA
 dist_systemunit_DATA += \
 	units/fedora/prefdm.service \
 	units/fedora/rc-local.service \
-	units/fedora/halt-local.service \
-	units/fedora/plymouth-start.service \
-	units/fedora/plymouth-read-write.service \
-	units/fedora/plymouth-quit.service \
-	units/fedora/plymouth-reboot.service \
-	units/fedora/plymouth-kexec.service \
-	units/fedora/plymouth-poweroff.service \
-	units/fedora/plymouth-halt.service
+	units/fedora/halt-local.service
+endif
+
+if HAVE_PLYMOUTH
+dist_systemunit_DATA += \
+	units/plymouth-start.service \
+	units/plymouth-read-write.service \
+	units/plymouth-quit.service \
+	units/plymouth-reboot.service \
+	units/plymouth-kexec.service \
+	units/plymouth-poweroff.service \
+	units/plymouth-halt.service
 endif
 
 dist_doc_DATA = \
@@ -1271,20 +1275,13 @@ install-data-hook:
 	( cd $(DESTDIR)$(dbussessionservicedir) && \
 		rm -f org.freedesktop.systemd1.service && \
 		$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if TARGET_FEDORA
+if HAVE_PLYMOUTH
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
 		$(DESTDIR)$(systemunitdir)/reboot.target.wants \
 		$(DESTDIR)$(systemunitdir)/kexec.target.wants \
 		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
-		$(DESTDIR)$(systemunitdir)/halt.target.wants \
-		$(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)/final.target.wants && \
-		rm -f halt-local.service && \
-		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+		$(DESTDIR)$(systemunitdir)/halt.target.wants
 	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
 		rm -f plymouth-start.service plymouth-read-write.service && \
 		$(LN_S) ../plymouth-start.service plymouth-start.service && \
@@ -1304,6 +1301,16 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
 		rm -f plymouth-halt.service && \
 		$(LN_S) ../plymouth-halt.service plymouth-halt.service )
+endif
+
+if TARGET_FEDORA
+	$(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)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f display-manager.service && \
 		$(LN_S) prefdm.service display-manager.service )
diff --git a/configure.ac b/configure.ac
index 1363b862b..4e7db2996 100644
--- a/configure.ac
+++ b/configure.ac
@@ -319,11 +319,13 @@ case $with_distro in
                 SPECIAL_SYSLOG_SERVICE=rsyslog.service
                 AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL])
                 M4_DISTRO_FLAG=-DTARGET_FEDORA=1
+		have_plymouth=true
                 ;;
         suse)
                 SYSTEM_SYSVRCND_PATH=/etc/init.d
                 AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE])
                 M4_DISTRO_FLAG=-DTARGET_SUSE=1
+		have_plymouth=true
                 ;;
         debian)
                 SYSTEM_SYSVRCND_PATH=/etc
@@ -427,6 +429,8 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 AM_CONDITIONAL(TARGET_FRUGALWARE, test x"$with_distro" = xfrugalware)
 AM_CONDITIONAL(TARGET_ALTLINUX, test x"$with_distro" = xaltlinux)
 
+AM_CONDITIONAL(HAVE_PLYMOUTH, test -n "$have_plymouth")
+
 AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
 
 AC_ARG_WITH([dbuspolicydir],
diff --git a/units/fedora/plymouth-halt.service b/units/plymouth-halt.service
similarity index 100%
rename from units/fedora/plymouth-halt.service
rename to units/plymouth-halt.service
diff --git a/units/fedora/plymouth-kexec.service b/units/plymouth-kexec.service
similarity index 100%
rename from units/fedora/plymouth-kexec.service
rename to units/plymouth-kexec.service
diff --git a/units/fedora/plymouth-poweroff.service b/units/plymouth-poweroff.service
similarity index 100%
rename from units/fedora/plymouth-poweroff.service
rename to units/plymouth-poweroff.service
diff --git a/units/fedora/plymouth-quit.service b/units/plymouth-quit.service
similarity index 100%
rename from units/fedora/plymouth-quit.service
rename to units/plymouth-quit.service
diff --git a/units/fedora/plymouth-read-write.service b/units/plymouth-read-write.service
similarity index 100%
rename from units/fedora/plymouth-read-write.service
rename to units/plymouth-read-write.service
diff --git a/units/fedora/plymouth-reboot.service b/units/plymouth-reboot.service
similarity index 100%
rename from units/fedora/plymouth-reboot.service
rename to units/plymouth-reboot.service
diff --git a/units/fedora/plymouth-start.service b/units/plymouth-start.service
similarity index 100%
rename from units/fedora/plymouth-start.service
rename to units/plymouth-start.service