From 0bf0cf48ff669ee53257e4a3b6b2d4709c332707 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed, 28 Apr 2021 11:46:02 +0200
Subject: [PATCH] Cygwin: specify toollibdir toolincludedir in terms of tooldir

Specify toollibdir and toolincludedir in terms of tooldir, so the
install location is correct if tooldir is the default
($(exec_prefix)/$(target_alias)), or explicitly specified on the 'make'
command line.
---
 winsup/cygwin/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index ea9d4b382..a2e673c13 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -32,8 +32,8 @@ newlib_build=$(target_builddir)/newlib
 # installed there by newlib.
 #
 
-toollibdir=$(prefix)/$(target_alias)/lib
-toolincludedir=$(prefix)/$(target_alias)/include
+toollibdir=$(tooldir)/lib
+toolincludedir=$(tooldir)/include
 
 # Parameters used in building the cygwin.dll.