From dcbf7f8ad1b07ff718eac2ce79ed522ac1cee189 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Fri, 8 Sep 2017 15:11:31 -0400 Subject: [PATCH 2/3] criu: Change libraries install directory Install the libraries into /usr/lib(or /usr/lib64) Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Jianchuan Wang Signed-off-by: Mark Asselstine Rebase for criu 3.17.1. Signed-off-by: Kai Kang --- Makefile.install | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Makefile.install b/Makefile.install index 1b02b70af..2839ef5fe 100644 --- a/Makefile.install +++ b/Makefile.install @@ -9,19 +9,6 @@ LIBEXECDIR ?= $(PREFIX)/libexec RUNDIR ?= /run PLUGINDIR ?= $(PREFIX)/lib/criu -# -# 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 - # # LIBDIR falls back to the standard path. LIBDIR ?= $(PREFIX)/lib -- 2.25.1