Skip to content

Commit

Permalink
Makefile: Ensure policy.json uses new variable
Browse files Browse the repository at this point in the history
In 18e6c6f there where changes to
better handle PREFIX and DESTDIR in the Makefile. "CONTAINERSCONFIGDIR"
was renamed to "CONTAINERSCONFDIR" without ensuring it was correct in
the install block. This results in policy.json being isntalled into
"${DESTDIR}/" which is "/policy.json" for Linux distros.

Signed-off-by: Morten Linderud <[email protected]>
  • Loading branch information
Foxboron authored and lsm5 committed Apr 19, 2021
1 parent 060fe4b commit c84fc7d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ clean:

install: install-binary install-docs install-completions
install -d -m 755 ${DESTDIR}/${SIGSTOREDIR}
install -d -m 755 ${DESTDIR}/${CONTAINERSCONFIGDIR}
install -m 644 default-policy.json ${DESTDIR}/${CONTAINERSCONFIGDIR}/policy.json
install -d -m 755 ${DESTDIR}/${CONTAINERSCONFDIR}
install -m 644 default-policy.json ${DESTDIR}/${CONTAINERSCONFDIR}/policy.json
install -d -m 755 ${DESTDIR}/${REGISTRIESDDIR}
install -m 644 default.yaml ${DESTDIR}/${REGISTRIESDDIR}/default.yaml

Expand Down

0 comments on commit c84fc7d

Please sign in to comment.