From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <corinna@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2155)
 id 010CA398407C; Thu, 29 Apr 2021 09:37:29 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 010CA398407C
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Corinna Vinschen <corinna@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: specify toollibdir toolincludedir in terms of
 tooldir
X-Act-Checkin: newlib-cygwin
X-Git-Author: Jon Turney <jon.turney@dronecode.org.uk>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: a26779fae0c2fc179accd4e3a7f8faa2b6ab1fd6
X-Git-Newrev: 0bf0cf48ff669ee53257e4a3b6b2d4709c332707
Message-Id: <20210429093729.010CA398407C@sourceware.org>
Date: Thu, 29 Apr 2021 09:37:29 +0000 (GMT)
X-BeenThere: cygwin-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin core component git logs <cygwin-cvs.cygwin.com>
List-Unsubscribe: <https://cygwin.com/mailman/options/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-cvs/>
List-Help: <mailto:cygwin-cvs-request@cygwin.com?subject=help>
List-Subscribe: <https://cygwin.com/mailman/listinfo/cygwin-cvs>,
 <mailto:cygwin-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Thu, 29 Apr 2021 09:37:29 -0000

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0bf0cf48ff669ee53257e4a3b6b2d4709c332707

commit 0bf0cf48ff669ee53257e4a3b6b2d4709c332707
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Apr 28 11:46:02 2021 +0200

    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.

Diff:
---
 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.