|
@@ -1,59 +0,0 @@
|
|
|
-From 60a581253331ac38721a12495909d073eff703b7 Mon Sep 17 00:00:00 2001
|
|
|
-From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
|
-Date: Sat, 13 Aug 2016 18:47:17 +0200
|
|
|
-Subject: [PATCH] configure: add option to not build manpages
|
|
|
-
|
|
|
-Man pages are not always needed, especially on embedded systems.
|
|
|
-
|
|
|
-Add a configure option to not build them; by default, build them.
|
|
|
-
|
|
|
-Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
|
|
----
|
|
|
-Patch sent upstream:
|
|
|
- https://github.com/systemd/systemd-bootchart/pull/14
|
|
|
----
|
|
|
- Makefile.am | 5 ++++-
|
|
|
- configure.ac | 10 +++++++++-
|
|
|
- 2 files changed, 13 insertions(+), 2 deletions(-)
|
|
|
-
|
|
|
-diff --git a/Makefile.am b/Makefile.am
|
|
|
-index a71f8d8..e6510d5 100644
|
|
|
---- a/Makefile.am
|
|
|
-+++ b/Makefile.am
|
|
|
-@@ -74,7 +74,10 @@ EXTRA_DIST = \
|
|
|
- MANPAGES = man/bootchart.conf.5 man/systemd-bootchart.1
|
|
|
- MANPAGES_ALIAS = man/bootchart.conf.d.5
|
|
|
-
|
|
|
--man_MANS = $(MANPAGES) $(MANPAGES_ALIAS)
|
|
|
-+if COND_man
|
|
|
-+MAYBE_MANPAGES = $(MANPAGES) $(MANPAGES_ALIAS)
|
|
|
-+endif
|
|
|
-+man_MANS = $(MAYBE_MANPAGES)
|
|
|
-
|
|
|
- man/bootchart.conf.d.5: man/bootchart.conf.5
|
|
|
-
|
|
|
-diff --git a/configure.ac b/configure.ac
|
|
|
-index f8e62d8..90e8b03 100644
|
|
|
---- a/configure.ac
|
|
|
-+++ b/configure.ac
|
|
|
-@@ -167,8 +167,16 @@ AC_ARG_WITH([rootlibdir],
|
|
|
- AC_SUBST([rootprefix], [$with_rootprefix])
|
|
|
- AC_SUBST([rootlibdir], [$with_rootlibdir])
|
|
|
-
|
|
|
-+AC_ARG_ENABLE([man],
|
|
|
-+ AS_HELP_STRING([--diable-man],[Build the man pages (default: yes)]),
|
|
|
-+ [build_man=$enableval],
|
|
|
-+ [build_man=yes])
|
|
|
-+
|
|
|
- AC_PATH_PROG([XSLTPROC], [xsltproc])
|
|
|
--AS_IF([test -z "$XSLTPROC"], AC_MSG_ERROR([*** xsltproc is required for man pages]))
|
|
|
-+AS_IF([test -z "$XSLTPROC" -a "$build_man" = "yes"],
|
|
|
-+ [AC_MSG_ERROR([*** xsltproc is required for man pages])])
|
|
|
-+
|
|
|
-+AM_CONDITIONAL([COND_man],[test "$build_man" = "yes"])
|
|
|
-
|
|
|
- AC_CONFIG_FILES([
|
|
|
- Makefile
|
|
|
---
|
|
|
-2.7.4
|
|
|
-
|