From 6dd4440125f75ccae5e7fd3af1fa987f9df8cdaf Mon Sep 17 00:00:00 2001 From: "LevitatingBusinessMan (Rein Fernhout)" Date: Fri, 23 Aug 2024 16:16:33 -0400 Subject: [PATCH] remove use of install in Makefile (#56) The current make `install` target uses `install -D` to create leading components when install into a directory. This doesn't work on some variants of `install(1)`. Also see https://git.telodendria.io/Telodendria/Cytoplasm/issues/45 and https://git.telodendria.io/Telodendria/Cytoplasm/issues/13 and https://git.telodendria.io/Telodendria/Cytoplasm/commit/08166dd3a77609b7a87e618f42099bbfd346204c. --- Please review the developer certificate of origin: 1. The contribution was created in whole or in part by me, and I have the right to submit it under the open source licenses of the Telodendria project; or 1. The contribution is based upon a previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the Telodendria project license; or 1. The contribution was provided directly to me by some other person who certified (1), (2), or (3), and I have not modified it. 1. I understand and agree that this project and the contribution are made public and that a record of the contribution—including all personal information I submit with it—is maintained indefinitely and may be redistributed consistent with this project or the open source licenses involved. - [x] I have read the Telodendria Project development certificate of origin, and I certify that I have permission to submit this patch under the conditions specified in it. Reviewed-on: https://git.telodendria.io/Telodendria/Telodendria/pulls/56 Co-authored-by: LevitatingBusinessMan (Rein Fernhout) Co-committed-by: LevitatingBusinessMan (Rein Fernhout) --- configure | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1da5858..17bacfa 100755 --- a/configure +++ b/configure @@ -231,15 +231,19 @@ compile_schema() { install_out() { src="$1" out="$2" + dir=$(dirname "$out") - echo "${TAB}install -D \"$src\" \"$out\"" + echo "${TAB}mkdir -p \"$dir\"" + echo "${TAB}cp \"$src\" \"$out\"" } install_man() { src="${OUT}/man/man3/${BIN_NAME}-$(basename $1 .h).3" out="$2" + dir=$(dirname "$out") - echo "${TAB}install -D \"$src\" \"$out\"" + echo "${TAB}mkdir -p \"$dir\"" + echo "${TAB}cp \"$src\" \"$out\"" } uninstall_out() { @@ -287,7 +291,8 @@ ${TAB}done ${BIN_NAME}: ${OUT}/bin/${BIN_NAME} install: ${BIN_NAME} -${TAB}install -D ${OUT}/bin/${BIN_NAME} \$(PREFIX)/bin/${BIN_NAME} +${TAB}mkdir -p \$(PREFIX)/bin +${TAB}cp ${OUT}/bin/${BIN_NAME} \$(PREFIX)/bin/${BIN_NAME} uninstall: ${TAB}rm \$(PREFIX)/bin/${BIN_NAME}