| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 51d661ff33bb254d7b335a9c87acf5c6e7a94192 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 3 | Date: Tue, 31 Jul 2018 15:08:34 +0800 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 | --- |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 18 | Makefile.in | 6 +++--- |
| 19 | configure.ac | 1 - |
| 20 | 2 files changed, 3 insertions(+), 4 deletions(-) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 21 | |
| 22 | diff --git a/Makefile.in b/Makefile.in |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 23 | index e2f5a84..acf31e5 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 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 | |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 30 | -SUBDIRS = conf daemons include lib libdaemon libdm man scripts device_mapper tools |
| 31 | +SUBDIRS = conf daemons include lib libdaemon libdm scripts device_mapper tools |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 32 | |
| 33 | ifeq ("@UDEV_RULES@", "yes") |
| 34 | SUBDIRS += udev |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 35 | @@ -41,7 +41,7 @@ ifeq ($(MAKECMDGOALS),clean) |
| 36 | endif |
| 37 | # FIXME Should use intermediate Makefiles here! |
| 38 | ifeq ($(MAKECMDGOALS),distclean) |
| 39 | - SUBDIRS = conf include man test scripts \ |
| 40 | + SUBDIRS = conf include test scripts \ |
| 41 | libdaemon lib tools daemons libdm \ |
| 42 | udev po liblvm python device_mapper |
| 43 | tools.distclean: test.distclean |
| 44 | @@ -71,7 +71,7 @@ liblvm.device-mapper: include.device-mapper |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 45 | daemons.device-mapper: libdm.device-mapper |
| 46 | tools.device-mapper: libdm.device-mapper |
| 47 | scripts.device-mapper: include.device-mapper |
| 48 | -device-mapper: tools.device-mapper daemons.device-mapper man.device-mapper |
| 49 | +device-mapper: tools.device-mapper daemons.device-mapper |
| 50 | |
| 51 | ifeq ("@INTL@", "yes") |
| 52 | lib.pofile: include.pofile |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 53 | diff --git a/configure.ac b/configure.ac |
| 54 | index aa374ea..5a92cba 100644 |
| 55 | --- a/configure.ac |
| 56 | +++ b/configure.ac |
| 57 | @@ -2124,7 +2124,6 @@ libdm/Makefile |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 58 | libdm/libdevmapper.pc |
| 59 | liblvm/Makefile |
| 60 | liblvm/liblvm2app.pc |
| 61 | -man/Makefile |
| 62 | po/Makefile |
| 63 | python/Makefile |
| 64 | python/setup.py |
| 65 | -- |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 66 | 2.7.4 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 67 | |