Feature plymouth: Fix plymouth libdir

Signed-off-by: Alexey Gladkov <[email protected]>
osboot · Jun 7, 2021 · 1db6819 · 1db6819
1 parent d4f06a5
commit 1db6819
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/features/plymouth/bin/get-theme-files b/features/plymouth/bin/get-theme-files
@@ -46,7 +46,7 @@ get_module()
 
 				set -- ${l#*=}
 
-				fn="$LIBDIR/plymouth/$*.so"
+				fn="$PLYMOUTH_LIBDIR/$*.so"
 
 				[ -f "$fn" ] ||
 					fatal "ModuleName: file not found: $fn"

diff --git a/features/plymouth/rules.mk b/features/plymouth/rules.mk
@@ -3,7 +3,7 @@ PLYMOUTH_LIBDIR := $(shell $(FEATURESDIR)/plymouth/bin/get-libdir)
 PLYMOUTH_PACK_MODULES := $(shell $(FEATURESDIR)/plymouth/bin/get-modules)
 PLYMOUTH_PACK_FONT    := $(or $(PLYMOUTH_FONT),$(shell fc-match -f '%{file}\n' 'DejaVuSans' ||:))
 PLYMOUTH_PACK_THEME   := $(shell env \
-		"LIBDIR=$(LIBDIR)" \
+		"PLYMOUTH_LIBDIR=$(PLYMOUTH_LIBDIR)" \
 		"DATADIR=$(DATADIR)" \
 		$(FEATURESDIR)/plymouth/bin/get-theme-files "$(PLYMOUTH_THEME)")