Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Define TARGET_PREFIX to use with grub2 deployment #760

Closed
wants to merge 3 commits into from
Closed

Define TARGET_PREFIX to use with grub2 deployment #760

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3c8ba8
Define TARGET_PREFIX to use with grub2 deployment
Mar 27, 2017
d6eaaff
fixup! Define TARGET_PREFIX to use with grub2 deployment
cgwalters Mar 27, 2017
b56e8b3
fixup! Define TARGET_PREFIX to use with grub2 deployment
cgwalters Mar 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile.am
View file
Open in desktop
Expand Up @@ -48,6 +48,8 @@ endif

EXTRA_DIST += autogen.sh COPYING README.md

DEFS += -DTARGET_PREFIX="\"$(prefix)\""
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Huh, I'd never heard of DEFS before. Let's instead add to AM_CPPFLAGS, since we use that above this for very similar things like -DDATADIR='"$(datadir)"'.


OT_INTERNAL_GIO_UNIX_CFLAGS = $(OT_DEP_GIO_UNIX_CFLAGS)
OT_INTERNAL_GIO_UNIX_LIBS = $(OT_DEP_GIO_UNIX_LIBS)
OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion src/libostree/ostree-bootloader-grub2.c
View file
Open in desktop
Expand Up @@ -312,7 +312,7 @@ _ostree_bootloader_grub2_write_config (OstreeBootloader *bootloader,
use_system_grub2_mkconfig = FALSE;
}
else
grub_exec = use_system_grub2_mkconfig ? GRUB2_MKCONFIG_PATH : "/usr/lib/ostree/ostree-grub-generator";
grub_exec = use_system_grub2_mkconfig ? GRUB2_MKCONFIG_PATH : TARGET_PREFIX "/lib/ostree/ostree-grub-generator";

if (use_system_grub2_mkconfig && ostree_sysroot_get_booted_deployment (self->sysroot) == NULL
&& g_file_has_parent (self->sysroot->path, NULL))
Expand Down