Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

build: Allow installing pre-built manual pages if rst2man is missing

This commit is contained in:
Marcel Holtmann 2019-10-03 10:05:19 +02:00
parent 69583191de
commit a6e9ba71eb
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -595,8 +595,12 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
-e 's,@libexecdir\@,$(libexecdir),g' \ -e 's,@libexecdir\@,$(libexecdir),g' \
< $< > $@ < $< > $@
if RUN_RST2MAN
RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \ RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \
--no-datestamp < $< > $@ --no-datestamp < $< > $@
else
RST2MAN_PROCESS = $(AM_V_GEN)touch $@
endif
%.service: %.service.in Makefile %.service: %.service.in Makefile
$(SED_PROCESS) $(SED_PROCESS)

7
configure.ac
View File

@ -191,11 +191,8 @@ AC_ARG_ENABLE([manual-pages], AC_HELP_STRING([--disable-manual-pages],
[don't install manual pages]), [don't install manual pages]),
[enable_manual_pages=${enableval}]) [enable_manual_pages=${enableval}])
if (test "${enable_manual_pages}" != "no"); then if (test "${enable_manual_pages}" != "no"); then
AC_CHECK_PROGS(RST2MAN, [rst2man rst2man-3 rst2man.py], "no") AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
if (test "x$RST2MAN" = "xno"); then AM_CONDITIONAL(RUN_RST2MAN, test "${RST2MAN}" != "no")
AC_MSG_WARN([rst2man required for building manual pages])
enable_manual_pages="no"
fi
fi fi
AM_CONDITIONAL(MANUAL_PAGES, test "${enable_manual_pages}" != "no") AM_CONDITIONAL(MANUAL_PAGES, test "${enable_manual_pages}" != "no")