Define TARGET_PREFIX to use with grub2 deployment #760
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cgwalters
reviewed
Mar 27, 2017
Makefile.am
Outdated
| @@ -48,6 +48,8 @@ endif | |||
|
|
|||
| EXTRA_DIST += autogen.sh COPYING README.md | |||
|
|
|||
| DEFS += -DTARGET_PREFIX="\"$(prefix)\"" | |||
There was a problem hiding this comment.
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)"'.
OYTIS
commented
Mar 27, 2017
Makefile.am
Outdated
| @@ -24,7 +24,7 @@ OSTREE_GITREV=$(shell if command -v git >/dev/null 2>&1 && test -d $(srcdir)/.gi | |||
| ACLOCAL_AMFLAGS = -I buildutil -I libglnx ${ACLOCAL_FLAGS} | |||
| AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \ | |||
| -DLOCALEDIR=\"$(datadir)/locale\" -DSYSCONFDIR=\"$(sysconfdir)\" \ | |||
| -DSHORTENED_SYSCONFDIR=\"$(shortened_sysconfdir)\" \ | |||
| -DTARGET_PREFIX='"$(prefix)' -DSHORTENED_SYSCONFDIR=\"$(shortened_sysconfdir)\" \ | |||
There was a problem hiding this comment.
Closing quote is probably missing. I'll check if it works for me.
There was a problem hiding this comment.
Yep, pushed another fixup ⬇️ - let me know if it works for you.
|
@cgwalters Works fine, thank you. |
|
☀️ Test successful - status-atomicjenkins |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hardcoded path to ostree-grub-generator breaks workwlow with prefixes other that /usr.