Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-process/criu/files: criu-1.2-makefile.patch
Date: Sat, 01 Mar 2014 05:40:35
Message-Id: 20140301054030.795482004E@flycatcher.gentoo.org
1 radhermit 14/03/01 05:40:30
2
3 Added: criu-1.2-makefile.patch
4 Log:
5 Version bump.
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
8
9 Revision Changes Path
10 1.1 sys-process/criu/files/criu-1.2-makefile.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/files/criu-1.2-makefile.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-process/criu/files/criu-1.2-makefile.patch?rev=1.1&content-type=text/plain
14
15 Index: criu-1.2-makefile.patch
16 ===================================================================
17 --- criu-1.2/Makefile
18 +++ criu-1.2/Makefile
19 @@ -256,6 +256,7 @@
20 $(Q) mkdir -p $(DESTDIR)$(SYSTEMDUNITDIR)
21 $(Q) install -m 644 scripts/sd/criu.socket $(DESTDIR)$(SYSTEMDUNITDIR)
22 $(Q) install -m 644 scripts/sd/criu.service $(DESTDIR)$(SYSTEMDUNITDIR)
23 + $(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR)
24 $(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR)
25
26 install-man:
27 --- criu-1.2/Makefile.inc
28 +++ criu-1.2/Makefile.inc
29 @@ -15,15 +15,9 @@
30 SBINDIR := $(PREFIX)/sbin
31 MANDIR := $(PREFIX)/share/man
32 SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system/
33 -LOGROTATEDIR := $(PREFIX)/etc/logrotate.d/
34 +LOGROTATEDIR := $(SYSCONFDIR)/logrotate.d/
35 LIBDIR := $(PREFIX)/lib
36 -# For recent Debian/Ubuntu with multiarch support
37 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture \
38 - -qDEB_HOST_MULTIARCH 2>/dev/null)
39 -ifneq "$(DEB_HOST_MULTIARCH)" ""
40 -LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
41 -# For most other systems
42 -else ifeq "$(shell uname -m)" "x86_64"
43 +ifeq "$(shell uname -m)" "x86_64"
44 LIBDIR := $(PREFIX)/lib64
45 endif