From 581a643e17d81200af50f641a4b2c40ceafe46db Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 8 Apr 2016 10:28:17 -0400 Subject: [PATCH] build: Move grub2-15_ostree back to pkglibexecdir It's not quite namespaced enough to have `/usr/libexec/grub2-15_ostree`, and the Fedora spec file expects things in `/usr/libexec/ostree`. Changing the spec file would be annoying as we'd need conditionals. Closes: #249 Approved by: gatispaeglis --- Makefile-boot.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile-boot.am b/Makefile-boot.am index a2cdc28f..7ec54fa3 100644 --- a/Makefile-boot.am +++ b/Makefile-boot.am @@ -41,10 +41,10 @@ endif if !BUILDOPT_BUILTIN_GRUB2_MKCONFIG # We're using the system grub2-mkconfig generator -libexec_SCRIPTS = src/boot/grub2/grub2-15_ostree +pkglibexec_SCRIPTS += src/boot/grub2/grub2-15_ostree install-grub2-config-hook: mkdir -p $(DESTDIR)$(grub2configdir) - ln -sf $(libexecdir)/grub2-15_ostree $(DESTDIR)$(grub2configdir)/15_ostree + ln -sf $(pkglibexecdir)/grub2-15_ostree $(DESTDIR)$(grub2configdir)/15_ostree grub2configdir = $(sysconfdir)/grub.d INSTALL_DATA_HOOKS += install-grub2-config-hook else