[CRIU] [PATCH] make: Allow to install in custom dirs

Andrew Vagin avagin at odin.com
Thu Oct 1 07:53:03 PDT 2015


On Thu, Oct 01, 2015 at 11:00:29AM +0300, Cyrill Gorcunov wrote:
> There is no way to redefine install paths into
> some custom ones (say plain /usr). Fix it by
> using conditional inits.
>

Acked-by: Andrew Vagin <avagin at odin.com>

> Reported-by: Andrew Vagin <avagin at odin.com>
> Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
> ---
>  Makefile.inc | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/Makefile.inc b/Makefile.inc
> index 5496f41146b2..5f0a55202419 100644
> --- a/Makefile.inc
> +++ b/Makefile.inc
> @@ -11,20 +11,20 @@ endif
>  export E Q
>  
>  # Installation paths
> -PREFIX		:= /usr/local
> -SBINDIR		:= $(PREFIX)/sbin
> -MANDIR		:= $(PREFIX)/share/man
> -SYSTEMDUNITDIR	:= $(PREFIX)/lib/systemd/system/
> -LOGROTATEDIR	:= $(PREFIX)/etc/logrotate.d/
> -LIBDIR		:= $(PREFIX)/lib
> +PREFIX		?= /usr/local
> +SBINDIR		?= $(PREFIX)/sbin
> +MANDIR		?= $(PREFIX)/share/man
> +SYSTEMDUNITDIR	?= $(PREFIX)/lib/systemd/system/
> +LOGROTATEDIR	?= $(PREFIX)/etc/logrotate.d/
> +LIBDIR		?= $(PREFIX)/lib
>  # 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)
> +LIBDIR		?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
>  # For most other systems
>  else ifeq "$(shell uname -m)" "x86_64"
> -LIBDIR		:= $(PREFIX)/lib64
> +LIBDIR		?= $(PREFIX)/lib64
>  endif
>  
> -INCLUDEDIR	:= $(PREFIX)/include/criu
> +INCLUDEDIR	?= $(PREFIX)/include/criu
> -- 
> 2.4.3
> 


More information about the CRIU mailing list