| Patrick Williams | d849ec7 | 2016-08-17 14:59:38 -0500 | [diff] [blame^] | 1 | From cb9933dc34af0b4d52c4584332600114ac65c402 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jianchuan Wang <jianchuan.wang@windriver.com> |
| 3 | Date: Tue, 4 Aug 2015 17:45:51 +0800 |
| 4 | Subject: [PATCH] criu: Change libraries install directory |
| 5 | |
| 6 | Install the libraries into /usr/lib(/usr/lib64) |
| 7 | |
| 8 | Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> |
| 9 | --- |
| 10 | Makefile | 2 +- |
| 11 | Makefile.inc | 9 --------- |
| 12 | 2 files changed, 1 insertion(+), 10 deletions(-) |
| 13 | |
| 14 | diff --git a/Makefile b/Makefile |
| 15 | index 7f5c890..6dbc436 100644 |
| 16 | --- a/Makefile |
| 17 | +++ b/Makefile |
| 18 | @@ -351,7 +351,7 @@ install-man: |
| 19 | |
| 20 | install-crit: crit |
| 21 | $(E) " INSTALL crit" |
| 22 | - $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) |
| 23 | + $(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --install-lib=$(LIBDIR) |
| 24 | |
| 25 | .PHONY: install install-man install-crit install-criu |
| 26 | |
| 27 | diff --git a/Makefile.inc b/Makefile.inc |
| 28 | index 5496f41..ba70aea 100644 |
| 29 | --- a/Makefile.inc |
| 30 | +++ b/Makefile.inc |
| 31 | @@ -17,14 +17,5 @@ MANDIR := $(PREFIX)/share/man |
| 32 | SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system/ |
| 33 | LOGROTATEDIR := $(PREFIX)/etc/logrotate.d/ |
| 34 | LIBDIR := $(PREFIX)/lib |
| 35 | -# For recent Debian/Ubuntu with multiarch support |
| 36 | -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \ |
| 37 | - -qDEB_HOST_MULTIARCH 2>/dev/null) |
| 38 | -ifneq "$(DEB_HOST_MULTIARCH)" "" |
| 39 | -LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) |
| 40 | -# For most other systems |
| 41 | -else ifeq "$(shell uname -m)" "x86_64" |
| 42 | -LIBDIR := $(PREFIX)/lib64 |
| 43 | -endif |
| 44 | |
| 45 | INCLUDEDIR := $(PREFIX)/include/criu |
| 46 | -- |
| 47 | 1.9.1 |
| 48 | |