diff --git a/Makefile b/Makefile index 7eca8784..d899c78a 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,11 @@ GPGME_ENV := CGO_CFLAGS="$(shell gpgme-config --cflags 2>/dev/null)" CGO_LDFLAGS # The following variables very roughly follow https://www.gnu.org/prep/standards/standards.html#Makefile-Conventions . DESTDIR ?= PREFIX ?= /usr/local +ifeq ($(shell uname -s),FreeBSD) +CONTAINERSCONFDIR ?= /usr/local/etc/containers +else CONTAINERSCONFDIR ?= /etc/containers +endif REGISTRIESDDIR ?= ${CONTAINERSCONFDIR}/registries.d SIGSTOREDIR ?= /var/lib/containers/sigstore BINDIR ?= ${PREFIX}/bin diff --git a/hack/btrfs_installed_tag.sh b/hack/btrfs_installed_tag.sh index 357f33b8..c4d99f37 100755 --- a/hack/btrfs_installed_tag.sh +++ b/hack/btrfs_installed_tag.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cc -E - > /dev/null 2> /dev/null << EOF #include EOF diff --git a/hack/btrfs_tag.sh b/hack/btrfs_tag.sh index cc48504a..59cb969a 100755 --- a/hack/btrfs_tag.sh +++ b/hack/btrfs_tag.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash cc -E - > /dev/null 2> /dev/null << EOF #include EOF diff --git a/hack/libdm_tag.sh b/hack/libdm_tag.sh index 476545e3..c430faff 100755 --- a/hack/libdm_tag.sh +++ b/hack/libdm_tag.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash tmpdir="$PWD/tmp.$RANDOM" mkdir -p "$tmpdir" trap 'rm -fr "$tmpdir"' EXIT diff --git a/hack/tree_status.sh b/hack/tree_status.sh index 78fb4c6a..1853e812 100755 --- a/hack/tree_status.sh +++ b/hack/tree_status.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e STATUS=$(git status --porcelain)