blob: a72140500226668dedd693b234ace363cf4a9b58 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 7ebde06e00b591a88397dad74a1aa47fd562eb50 Mon Sep 17 00:00:00 2001
From: Jianchuan Wang <jianchuan.wang@windriver.com>
Date: Tue, 16 Aug 2016 09:48:08 +0800
Subject: [PATCH 1/2] criu: Change libraries install directory
Install the libraries into /usr/lib(or /usr/lib64)
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
---
Makefile.install | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/Makefile.install b/Makefile.install
index dbc22e1..a30dc96 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -11,19 +11,6 @@ LIBDIR ?= $(PREFIX)/lib
INCLUDEDIR ?= $(PREFIX)/include/criu
LIBEXECDIR ?= $(PREFIX)/libexec
-#
-# For recent Debian/Ubuntu with multiarch support.
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
-ifneq "$(DEB_HOST_MULTIARCH)" ""
- LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
-else
- #
- # For most other systems
- ifeq "$(shell uname -m)" "x86_64"
- LIBDIR ?= $(PREFIX)/lib64
- endif
-endif
-
export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR
--
2.7.4
|
