| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 1 | From 6a67d277941228d997b527990960413f8444fb81 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 2 Mar 2015 01:09:58 +0000 |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 4 | Subject: [PATCH] Point scripts location to libdir |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | Upstream-Status: Inappropriate [debian patch] |
| 7 | |
| 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 9 | --- |
| 10 | ld/Makefile.am | 2 +- |
| 11 | ld/Makefile.in | 2 +- |
| 12 | 2 files changed, 2 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/ld/Makefile.am b/ld/Makefile.am |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 15 | index 3b01357b651..b7a1f7491b0 100644 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 16 | --- a/ld/Makefile.am |
| 17 | +++ b/ld/Makefile.am |
| Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 18 | @@ -51,7 +51,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | # We put the scripts in the directory $(scriptdir)/ldscripts. |
| 20 | # We can't put the scripts in $(datadir) because the SEARCH_DIR |
| 21 | # directives need to be different for native and cross linkers. |
| 22 | -scriptdir = $(tooldir)/lib |
| 23 | +scriptdir = $(libdir) |
| 24 | |
| 25 | EMUL = @EMUL@ |
| 26 | EMULATION_OFILES = @EMULATION_OFILES@ |
| 27 | diff --git a/ld/Makefile.in b/ld/Makefile.in |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 28 | index a6382bf2a45..5ee3a4971be 100644 |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 29 | --- a/ld/Makefile.in |
| 30 | +++ b/ld/Makefile.in |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 31 | @@ -562,7 +562,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 32 | # We put the scripts in the directory $(scriptdir)/ldscripts. |
| 33 | # We can't put the scripts in $(datadir) because the SEARCH_DIR |
| 34 | # directives need to be different for native and cross linkers. |
| 35 | -scriptdir = $(tooldir)/lib |
| 36 | +scriptdir = $(libdir) |
| 37 | BASEDIR = $(srcdir)/.. |
| 38 | BFDDIR = $(BASEDIR)/bfd |
| 39 | INCDIR = $(BASEDIR)/include |