github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-29 16:17:44 +00:00
Code Issues Projects Releases Wiki Activity

Makefile: Ensure policy.json uses new variable

Browse Source 
In 18e6c6f17b 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 <morten@linderud.pw>
This commit is contained in:
Morten Linderud 2021-04-17 13:12:46 +02:00 committed by Lokesh Mandvekar
parent 060fe4b47f
commit c84fc7d243
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
View File

@ -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