| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 1 | From f64fbca70e6049dad3c404d871f2383d97725d2d Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
| 3 | Date: Fri, 8 Sep 2017 15:11:31 -0400 |
| 4 | Subject: [PATCH] criu: Change libraries install directory |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 5 | |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 6 | Install the libraries into /usr/lib(or /usr/lib64) |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 7 | |
| 8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 9 | Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 10 | |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 11 | --- |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 12 | Makefile.install | 13 ------------- |
| 13 | 1 file changed, 13 deletions(-) |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 14 | |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 15 | diff --git a/Makefile.install b/Makefile.install |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 16 | index 1def3cf..d020eef 100644 |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 17 | --- a/Makefile.install |
| 18 | +++ b/Makefile.install |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | @@ -9,19 +9,6 @@ LIBEXECDIR ?= $(PREFIX)/libexec |
| 20 | RUNDIR ?= /run |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 21 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 22 | # |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 23 | -# For recent Debian/Ubuntu with multiarch support. |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 24 | -DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 25 | -ifneq "$(DEB_HOST_MULTIARCH)" "" |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 26 | - LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) |
| 27 | -else |
| 28 | - # |
| 29 | - # For most other systems |
| 30 | - ifeq "$(shell uname -m)" "x86_64" |
| 31 | - LIBDIR ?= $(PREFIX)/lib64 |
| 32 | - endif |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 33 | -endif |
| Patrick Williams | e69d235 | 2017-02-23 20:56:04 -0600 | [diff] [blame] | 34 | - |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 35 | -# |
| 36 | # LIBDIR falls back to the standard path. |
| 37 | LIBDIR ?= $(PREFIX)/lib |
| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame] | 38 | |