From 103ac1c1200df8190372d973e004776cffe8e659 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 26 Nov 2018 14:59:55 +0800 Subject: [PATCH 2/3] do not build manual On some host (ubuntu 1404), build manual failed. ... ./tools/man-generator --primary lvscan lvscan.8_des Failed to stat description file lvscan.8_des. ... Do not build man to workaround the issue. Upstream-Status: Pending Signed-off-by: Hongxu Jia Update context for lvm2 2.03.02. Signed-off-by: Kai Kang Update context for lvm2 2.03.16. Signed-off-by: Wang Mingyu --- Makefile.in | 6 +++--- configure.ac | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3b7e0ec..37f14eb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ -SUBDIRS = libdm conf daemons include lib libdaemon man scripts tools +SUBDIRS = libdm conf daemons include lib libdaemon scripts tools ifeq ("@UDEV_RULES@", "yes") SUBDIRS += udev @@ -33,7 +33,7 @@ ifeq ($(MAKECMDGOALS),clean) endif # FIXME Should use intermediate Makefiles here! ifeq ($(MAKECMDGOALS),distclean) - SUBDIRS = conf include man test scripts \ + SUBDIRS = conf include test scripts \ libdaemon lib tools daemons libdm \ udev po tools.distclean: test.distclean @@ -59,7 +59,7 @@ unit-test run-unit-test: test daemons.device-mapper: libdm.device-mapper tools.device-mapper: libdm.device-mapper -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper +device-mapper: tools.device-mapper daemons.device-mapper device_mapper: device-mapper ifeq ("@INTL@", "yes") diff --git a/configure.ac b/configure.ac index 6def519..18a5c97 100644 --- a/configure.ac +++ b/configure.ac @@ -2018,7 +2018,6 @@ libdaemon/server/Makefile libdm/Makefile libdm/dm-tools/Makefile libdm/libdevmapper.pc -man/Makefile po/Makefile scripts/lvm2-pvscan.service scripts/blkdeactivate.sh -- 2.25.1