1From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 26 Nov 2018 14:59:55 +0800
4Subject: [PATCH 2/3] do not build manual
5
6On some host (ubuntu 1404), build manual failed.
7...
8./tools/man-generator --primary lvscan lvscan.8_des
9Failed to stat description file lvscan.8_des.
10...
11
12Do not build man to workaround the issue.
13
14Upstream-Status: Pending
15
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17
18
19Update context for lvm2 2.03.02.
20
21Signed-off-by: Kai Kang <kai.kang@windriver.com>
22---
23 Makefile.in  | 6 +++---
24 configure.ac | 1 -
25 2 files changed, 3 insertions(+), 4 deletions(-)
26
27diff --git a/Makefile.in b/Makefile.in
28index 6a1a990..80cba91 100644
29--- a/Makefile.in
30+++ b/Makefile.in
31@@ -18,7 +18,7 @@ top_builddir = @top_builddir@
32 abs_top_builddir = @abs_top_builddir@
33 abs_top_srcdir = @abs_top_srcdir@
34
35-SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools
36+SUBDIRS = conf daemons include lib libdaemon libdm scripts tools
37
38 ifeq ("@UDEV_RULES@", "yes")
39   SUBDIRS += udev
40@@ -33,7 +33,7 @@ ifeq ($(MAKECMDGOALS),clean)
41 endif
42 # FIXME Should use intermediate Makefiles here!
43 ifeq ($(MAKECMDGOALS),distclean)
44-  SUBDIRS = conf include man test scripts \
45+  SUBDIRS = conf include test scripts \
46     libdaemon lib tools daemons libdm \
47     udev po
48 tools.distclean: test.distclean
49@@ -65,7 +65,7 @@ libdm.device-mapper: include.device-mapper
50 daemons.device-mapper: libdm.device-mapper
51 tools.device-mapper: libdm.device-mapper
52 scripts.device-mapper: include.device-mapper
53-device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper
54+device-mapper: tools.device-mapper daemons.device-mapper
55
56 ifeq ("@INTL@", "yes")
57 lib.pofile: include.pofile
58diff --git a/configure.ac b/configure.ac
59index 7fd0561..4154dc0 100644
60--- a/configure.ac
61+++ b/configure.ac
62@@ -1812,7 +1812,6 @@ libdaemon/server/Makefile
63 libdm/Makefile
64 libdm/dm-tools/Makefile
65 libdm/libdevmapper.pc
66-man/Makefile
67 po/Makefile
68 scripts/lvm2-pvscan.service
69 scripts/blkdeactivate.sh
70--
712.7.4
72
73