Makefile: fix DESTDIR and PREFIX concatenation#5662
Merged
AkihiroSuda merged 1 commit intocontainerd:mainfrom Jun 25, 2021
Merged
Makefile: fix DESTDIR and PREFIX concatenation#5662AkihiroSuda merged 1 commit intocontainerd:mainfrom
AkihiroSuda merged 1 commit intocontainerd:mainfrom
Conversation
Commits 77374e8 and b5f530a changed handling of the `DESTDIR` and `PREFIX` variables, and introduced a `MANDIR` variable. However, in those commits, the variables are concatenated with a directory separator (`/`); `$DESTDIR/$PREFIX`. The `$PREFIX` variable (and consequently, the `MANDIR` variable) already should have a leading `/` (absolute path), so there should be no need to add it. In addition, adding the `/`, would not allow either an empty path to be passed (well, it would result in `//` in the path), or for `$PREFIX` to be used with a relative path (with an empty `$PREFIX`). This patch removes the directory separator. Signed-off-by: Sebastiaan van Stijn <[email protected]>
AkihiroSuda
approved these changes
Jun 25, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Commits 77374e8 (#5577) and b5f530a #5535) changed handling of the
DESTDIRandPREFIXvariables, and introduced aMANDIRvariable.However, in those commits, the variables are concatenated with a directory separator (
/);$DESTDIR/$PREFIX. The$PREFIXvariable (and consequently, theMANDIRvariable) already should have a leading/(absolute path), so there should be no need to add it. In addition, adding the/, would not allow either an empty path to be passed (well, it would result in//in the path), or for$PREFIXto be used with a relative path (with an empty$PREFIX).This patch removes the directory separator.