35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From 4c5b23e52c1dc4e3fbbc7472b92e7b1ce9d22f02 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
|
||
|
|
Date: Thu, 30 Jul 2015 18:44:00 +0300
|
||
|
|
Subject: [PATCH] Fix criu.pc version
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Use CRTOOLSVERSION instead of GITID to write criu.pc version. With
|
||
|
|
GITID, criu.pc had version '0' when built from tarballs.
|
||
|
|
|
||
|
|
Signed-off-by: Cédric Bosdonnat <cbosdonnat@suse.com>
|
||
|
|
Acked-by: Tycho Andersen <tycho.andersen@canonical.com>
|
||
|
|
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
|
||
|
|
---
|
||
|
|
Makefile | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 6ed4c90..7f5c890 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -339,7 +339,7 @@ install-criu: $(PROGRAM) $(CRIU-LIB) install-crit
|
||
|
|
$(Q) install -m 644 scripts/sd/criu.service $(DESTDIR)$(SYSTEMDUNITDIR)
|
||
|
|
$(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR)
|
||
|
|
$(Q) install -m 644 scripts/logrotate.d/criu-service $(DESTDIR)$(LOGROTATEDIR)
|
||
|
|
- $(Q) sed -e 's,@version@,$(GITID),' \
|
||
|
|
+ $(Q) sed -e 's,@version@,$(CRTOOLSVERSION),' \
|
||
|
|
-e 's,@libdir@,$(LIBDIR),' \
|
||
|
|
-e 's,@includedir@,$(dir $(INCLUDEDIR)),' \
|
||
|
|
lib/criu.pc.in > criu.pc
|
||
|
|
--
|
||
|
|
2.1.4
|
||
|
|
|