| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame^] | 1 | From d8bb25e34d6533ba78eaae697771ee499a66706f Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 2 Aug 2017 03:41:37 -0400 |
| 4 | Subject: [PATCH] do not build manual |
| 5 | |
| 6 | On some host (ubuntu 1404), build manual failed. |
| 7 | ... |
| 8 | ./tools/man-generator --primary lvscan lvscan.8_des |
| 9 | Failed to stat description file lvscan.8_des. |
| 10 | ... |
| 11 | |
| 12 | Do not build man to workaround the issue. |
| 13 | |
| 14 | Upstream-Status: Pending |
| 15 | |
| 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 17 | --- |
| 18 | Makefile.in | 4 ++-- |
| 19 | configure.in | 1 - |
| 20 | 2 files changed, 2 insertions(+), 3 deletions(-) |
| 21 | |
| 22 | diff --git a/Makefile.in b/Makefile.in |
| 23 | index 31d428d..24f89a2 100644 |
| 24 | --- a/Makefile.in |
| 25 | +++ b/Makefile.in |
| 26 | @@ -18,7 +18,7 @@ top_builddir = @top_builddir@ |
| 27 | abs_top_builddir = @abs_top_builddir@ |
| 28 | abs_top_srcdir = @abs_top_srcdir@ |
| 29 | |
| 30 | -SUBDIRS = conf daemons include lib libdaemon libdm man scripts tools |
| 31 | +SUBDIRS = conf daemons include lib libdaemon libdm scripts tools |
| 32 | |
| 33 | ifeq ("@UDEV_RULES@", "yes") |
| 34 | SUBDIRS += udev |
| 35 | @@ -69,7 +69,7 @@ liblvm.device-mapper: include.device-mapper |
| 36 | daemons.device-mapper: libdm.device-mapper |
| 37 | tools.device-mapper: libdm.device-mapper |
| 38 | scripts.device-mapper: include.device-mapper |
| 39 | -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper |
| 40 | +device-mapper: tools.device-mapper daemons.device-mapper |
| 41 | |
| 42 | ifeq ("@INTL@", "yes") |
| 43 | lib.pofile: include.pofile |
| 44 | diff --git a/configure.in b/configure.in |
| 45 | index 1dc8819..108ace4 100644 |
| 46 | --- a/configure.in |
| 47 | +++ b/configure.in |
| 48 | @@ -2213,7 +2213,6 @@ libdm/Makefile |
| 49 | libdm/libdevmapper.pc |
| 50 | liblvm/Makefile |
| 51 | liblvm/liblvm2app.pc |
| 52 | -man/Makefile |
| 53 | po/Makefile |
| 54 | python/Makefile |
| 55 | python/setup.py |
| 56 | -- |
| 57 | 2.8.1 |
| 58 | |