From 5ace575f1e4471f43d6042208b765925848ca950 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sat, 16 Jan 2021 16:10:37 +0000
Subject: [PATCH] Fix installing using build-aux/install-sh

FossilOrigin-Name: 3a8b331cffbb7ec79c016e46b9e45f65bc6c52bdff2c345c7f29ebf3685b11e3
---
 build-aux/m4/buildsys.m4 | 7 +++++++
 configure.ac             | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build-aux/m4/buildsys.m4 b/build-aux/m4/buildsys.m4
index 4b96aea..ed9d8cf 100644
--- a/build-aux/m4/buildsys.m4
+++ b/build-aux/m4/buildsys.m4
@@ -36,6 +36,13 @@ AC_DEFUN([BUILDSYS_INIT], [
 		;;
 	esac
 
+	AC_PROG_INSTALL
+	case "$INSTALL" in
+	./build-aux/install-sh*)
+		INSTALL="$PWD/$INSTALL"
+		;;
+	esac
+
 	AC_CONFIG_COMMANDS_PRE([
 		AS_IF([test x"$GCC" = x"yes"],
 			[AC_SUBST(DEP_CFLAGS, '-MD -MF $${out%.o}.dep')])
diff --git a/configure.ac b/configure.ac
index 8b38f50..2326b8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,6 @@ BUILDSYS_INIT
 dnl If your package uses C, you want a C compiler and a C preprocessor
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_INSTALL
 
 dnl The buildsys might require ln -s to install libraries.
 dnl Uncomment if you are compiling a library.