update libdir detection to reflect to plymouth dir

Previously, plymouth was installed in /usr/bin and
we'd look for it there to figure out if this is a
64-bit or 32-bit install. Now it's in /bin, so we
need to look in /bin instead.

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a295be7dc52def5dde25a5c7adaf77adc17b77e5..6536fa13eb63f5aae41ba34574a837450d85fc31 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -15,11 +15,17 @@ plymouth-populate-initrd: $(srcdir)/plymouth-populate-initrd.in
            -e 's,[@]plymouthdaemondir[@],$(plymouthdaemondir),g'              \
            $(srcdir)/plymouth-populate-initrd.in > plymouth-populate-initrd
 
+plymouth-set-default-plugin: $(srcdir)/plymouth-set-default-plugin.in
+       sed -e 's,[@]logofile[@],$(logofile),g'                                \
+           -e 's,[@]plymouthclientdir[@],$(plymouthclientdir),g'              \
+           -e 's,[@]plymouthdaemondir[@],$(plymouthdaemondir),g'              \
+           $(srcdir)/plymouth-set-default-plugin.in > plymouth-set-default-plugin
+
 EXTRA_DIST= plymouth-update-initrd.in                                          \
            plymouth-populate-initrd.in                                        \
-           $(sbinscripts_SCRIPTS)                                             \
+           plymouth-set-default-plugin.in                                     \
            $(noinst_SCRIPTS)                                                  \
            default.cfg
 
-CLEANFILES = plymouth-update-initrd plymouth-populate-initrd
-MAINTAINERCLEANFILES = Makefile.in plymouth-update-inird plymouth-populate-initrd
+CLEANFILES = plymouth-update-initrd plymouth-populate-initrd plymouth-set-default-plugin
+MAINTAINERCLEANFILES = Makefile.in plymouth-update-initrd plymouth-populate-initrd plymouth-set-default-plugin

diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index 6d86ea40bc7ccf8bb77e20f8046ea109e984906c..e9db1b93dd568b3393fb49715b9dabaaeebfe721 100755 (executable)
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -5,7 +5,7 @@
 [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
 [ -z "$DATADIR" ] && DATADIR="/usr/share"
 [ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
-[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
+[ -z "$LIB" ] && $(echo nash-showelfinterp @plymouthclientdir@/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
 [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
 [ -z "$BINDIR" ] && BINDIR="/usr/bin"
 [ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"

diff --git a/scripts/plymouth-set-default-plugin b/scripts/plymouth-set-default-plugin.in
similarity index 88%
rename from scripts/plymouth-set-default-plugin
rename to scripts/plymouth-set-default-plugin.in
index 3edee7af15826b101632a092b10a9178703fb610..176444b6b83865140db085a197b6f84ddc834b42 100755 (executable)
--- a/scripts/plymouth-set-default-plugin
+++ b/scripts/plymouth-set-default-plugin.in
@@ -4,7 +4,7 @@ set -e
 
 [ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
 [ -z "$DATADIR" ] && DATADIR="/usr/share"
-[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
+[ -z "$LIB" ] && $(echo nash-showelfinterp @plymouthclientdir@/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
 [ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
 [ -z "$BINDIR" ] && BINDIR="/usr/bin"