[CRIU] Subject: [PATCH 2/2] Makefile variables BINDIR, SBINDIR, MANDIR, LIBDIR shall also be externally configurable.

[Francesco Giancane]

Thank you! Also, for the suggestion... I already read the guide but I
just formatted the patches using git format-patch... next time i will
rely on the automatic send mail from git :)

Francesco Giancane

Via Paolo Braccini 46, 10141 Torino (TO)
+393933920466
https://it.linkedin.com/in/francesco-giancane-aa7213117



2017-07-25 0:32 GMT+02:00 Andrei Vagin <avagin at virtuozzo.com>:
> Applied, thanks!
>
> Pls, read this article before sending next patches
> https://criu.org/How_to_submit_patches
>
> On Tue, Jun 27, 2017 at 09:51:36PM +0200, Francesco Giancane wrote:
>> From 551e9d2f88258f42c4f2594d7c6805c486b02f99 Mon Sep 17 00:00:00 2001
>> From: Francesco Giancane <francescogiancane8 at gmail.com>
>> Date: Mon, 26 Jun 2017 00:50:44 +0200
>> Subject: [PATCH 2/2] Makefile variables BINDIR, SBINDIR, MANDIR, LIBDIR shall
>>  also be externally configurable.
>>
>>  As stated in the official INSTALL.md document, BINDIR, SBINDIR, MANDIR, LIBDIR
>>  variables shall be configurable using environment variables.
>>
>> i.e.
>> export BINDIR='...'
>> export SBINDIR='...'
>> export MANDIR='...'
>> export LIBDIR='...'
>>
>> make install
>>
>>  Before this patch, they were set at fixed values. Now it is possible to change
>>  them at ease.
>>
>>  I preserved the possibility to add the '64' suffix or the DEB_HOST_MULTIARCH
>>  variable as before, so that the LIBDIR is correctly computed.
>>
>> Signed-off-by: Francesco Giancane <francescogiancane8 at gmail.com>
>> ---
>>  Makefile.install | 12 ++++++------
>>  1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/Makefile.install b/Makefile.install
>> index 3606e1e..bd8bbd8 100644
>> --- a/Makefile.install
>> +++ b/Makefile.install
>> @@ -1,10 +1,10 @@
>>  #
>>  # Installation paths.
>>  PREFIX ?= /usr/local
>> -BINDIR := $(PREFIX)/bin
>> -SBINDIR := $(PREFIX)/sbin
>> -MANDIR := $(PREFIX)/share/man
>> -LIBDIR := $(PREFIX)/lib
>> +BINDIR ?= $(PREFIX)/bin
>> +SBINDIR ?= $(PREFIX)/sbin
>> +MANDIR ?= $(PREFIX)/share/man
>> +LIBDIR ?= $(PREFIX)/lib
>>  INCLUDEDIR := $(PREFIX)/include
>>  LIBEXECDIR := $(PREFIX)/libexec
>>  RUNDIR ?= /run
>> @@ -13,12 +13,12 @@ RUNDIR ?= /run
>>  # 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 := $(LIBDIR)/$(DEB_HOST_MULTIARCH)
>>  else
>>          #
>>          # For most other systems
>>          ifeq "$(shell uname -m)" "x86_64"
>> -                LIBDIR := $(PREFIX)/lib64
>> + LIBDIR := $(LIBDIR)64
>>          endif
>>  endif
>>
>> --
>> 2.9.4
>>
>> Francesco Giancane
>> _______________________________________________
>> CRIU mailing list
>> CRIU at openvz.org
>> https://lists.openvz.org/mailman/listinfo/criu