packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Colin Walters 2016-04-08 10:28:17 -04:00 committed by Colin Walters (automation)
parent 594162f16a
commit 581a643e17
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile-boot.am
View File

@ -41,10 +41,10 @@ endif
if !BUILDOPT_BUILTIN_GRUB2_MKCONFIG if !BUILDOPT_BUILTIN_GRUB2_MKCONFIG
# We're using the system grub2-mkconfig generator # 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: install-grub2-config-hook:
mkdir -p $(DESTDIR)$(grub2configdir) 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 grub2configdir = $(sysconfdir)/grub.d
INSTALL_DATA_HOOKS += install-grub2-config-hook INSTALL_DATA_HOOKS += install-grub2-config-hook
else else