meta-starlingx/meta-stx-integ/recipes-support/cluster-glue/cluster-glue/0001-don-t-compile-doc-and-Error-Fix.patch

   1 From 86924cbbd595cde81584d74f6c93bcc4a080fcdd Mon Sep 17 00:00:00 2001
   2 From: Li xin <lixin.fnst@cn.fujitsu.com>
   3 Date: Tue, 18 Aug 2015 17:43:29 +0900
   4 Subject: [PATCH] don't compile doc and Error Fix
   5
   6 | help2man: can't get `--help' info from ../../lrm/admin/lrmadmin
   7 | make[2]: *** [lrmadmin.8] Error 1
   8
   9 | make[2]: a2x: Command not found
  10 | /usr/bin/xsltproc \
  11 |       --xinclude \
  12 |       http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl ha_logd.xml
  13 | make[2]: *** [hb_report.8] Error 127
  14
  15 Upstream-Status: pending
  16
  17 Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
  18 ---
  19  Makefile.am           |  2 +-
  20  configure.ac          |  6 ++++++
  21  lrm/admin/Makefile.am | 14 +++++++-------
  22  3 files changed, 14 insertions(+), 8 deletions(-)
  23
  24 diff --git a/Makefile.am b/Makefile.am
  25 index 93dbaf6..2f4d03b 100644
  26 --- a/Makefile.am
  27 +++ b/Makefile.am
  28 @@ -23,7 +23,7 @@ MAINTAINERCLEANFILES  = Makefile.in aclocal.m4 configure DRF/config-h.in \
  29                           DRF/stamp-h.in libtool.m4 ltdl.m4 libltdl.tar
  30
  31  SUBDIRS                        = include $(LIBLTDL_DIR) replace lib lrm logd \
  32 -                         hb_report doc config
  33 +                         hb_report config
  34
  35  install-exec-local:
  36         $(INSTALL) -d $(DESTDIR)/$(HA_COREDIR)
  37 diff --git a/configure.ac b/configure.ac
  38 index 36bcf12..809fae6 100644
  39 --- a/configure.ac
  40 +++ b/configure.ac
  41 @@ -1437,3 +1437,9 @@ AC_MSG_RESULT([  CFLAGS                   = ${CFLAGS}])
  42  AC_MSG_RESULT([  Libraries                = ${LIBS}])
  43  AC_MSG_RESULT([  Stack Libraries          = ${CLUSTERLIBS}])
  44
  45 +if test "$TARGET_PYTHON"; then
  46 +       TARGET_PYTHON=$TARGET_PYTHON
  47 +else
  48 +       TARGET_PYTHON=$PYTHON
  49 +fi
  50 +       AC_SUBST(TARGET_PYTHON)
  51 diff --git a/lrm/admin/Makefile.am b/lrm/admin/Makefile.am
  52 index a92cd72..de525ea 100644
  53 --- a/lrm/admin/Makefile.am
  54 +++ b/lrm/admin/Makefile.am
  55 @@ -31,10 +31,10 @@ lrmadmin_LDFLAGS    =       $(COMMONLIBS)
  56  lrmadmin_LDADD = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
  57  lrmadmin_DEPENDENCIES = $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
  58
  59 -if BUILD_HELP
  60 -man8_MANS =    $(sbin_PROGRAMS:%=%.8)
  61 -%.8:   %
  62 -       echo Creating $@
  63 -       chmod a+x $<
  64 -       help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA project" $(top_builddir)/lrm/admin/$<
  65 -endif
  66 +#if BUILD_HELP
  67 +#man8_MANS =   $(sbin_PROGRAMS:%=%.8)
  68 +#%.8:  %
  69 +#      echo Creating $@
  70 +#      chmod a+x $<
  71 +#      help2man --output $@ --no-info --section 8 --name "Part of the Linux-HA project" $(top_builddir)/lrm/admin/$<
  72 +#endif
  73 --
  74 1.8.4.2
  75