diff options
| author | Dmitry V. Levin <ldv@strace.io> | 2023-02-05 08:00:00 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2023-02-05 08:00:00 +0000 |
| commit | 0d1c62eb4733644bda03760182c395a903295a3e (patch) | |
| tree | 59c53a537a8e3e06d2b458d43b74455445784549 | |
| parent | 91951acae71f2cc596ba409fde3e08c746a18551 (diff) | |
| download | linux-pam-git-ldv/pam_env-vendordir.tar.gz | |
ci: make VENDORDIR based on $prefixldv/pam_env-vendordir
* ci/run-build-and-tests.sh: Accept VENDORDIR that does not start with /.
* .github/workflows/ci.yml (VENDORDIR): Change from /usr/etc to
${prefix}/share/etc, this should help to check that the code no longer
relies on the assumption that VENDORDIR == /usr/etc.
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rwxr-xr-x | ci/run-build-and-tests.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7310eafa..c9781563 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: env: CC: gcc-12 TARGET: x86_64 - VENDORDIR: /usr/etc + VENDORDIR: ${prefix}/share/etc steps: - uses: actions/checkout@v3 with: diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index ca61bb1f..66143820 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -33,7 +33,7 @@ case "${CHECK-}" in esac case "${VENDORDIR-}" in - /*) + */*) DISTCHECK_CONFIGURE_FLAGS="$DISTCHECK_CONFIGURE_FLAGS --enable-vendordir=$VENDORDIR" ;; esac |