From d1f321fdf9367d3a488f81c8c3c8b8aa5b8d69bb Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Wed, 15 Jul 2015 16:31:15 +0100 Subject: [PATCH] man: remove .man_fixup workaround The whole thing is quite messy - the file is used to indicate that the man pages were correctly generated prior to applying the "fixup" (alias) At the same time we use a rule with the same name, to create the same file if the generation has failed. In other words - it attempts to create the file either way. So there is little point in it and we can remove it. Spotted while attempting to build with bmake which kindly blocked on the following (non compliant construct) .man_fixup: | $(miscman_DATA) Cc: Jonathan Gray Signed-off-by: Emil Velikov --- man/Makefile.am | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/man/Makefile.am b/man/Makefile.am index 44b63a57..00eb4234 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -37,7 +37,7 @@ MAN_FILES = \ $(miscman_aliases_DATA) EXTRA_DIST = $(XML_FILES) -CLEANFILES = $(MAN_FILES) .man_fixup +CLEANFILES = $(MAN_FILES) XSLTPROC_FLAGS = \ --stringparam man.authors.section.enabled 0 \ @@ -48,14 +48,9 @@ XSLTPROC_FLAGS = \ $(MANPAGES_STYLESHEET) XSLTPROC_PROCESS_MAN = \ - $(AM_V_GEN)$(XSLTPROC) -o "$@" $(XSLTPROC_FLAGS) "$<" && \ - touch .man_fixup + $(AM_V_GEN)$(XSLTPROC) -o "$@" $(XSLTPROC_FLAGS) "$<" -# Force .man_fixup if $(miscman_DATA) are not built -.man_fixup: | $(miscman_DATA) - $(AM_V_GEN)touch .man_fixup - -$(miscman_aliases_DATA): $(miscman_DATA) .man_fixup +$(miscman_aliases_DATA): $(miscman_DATA) $(AM_V_GEN)if test -n "$@" ; then $(SED) -i -e 's/^\.so \([a-z_]\+\)\.\([0-9]\)$$/\.so man\2\/\1\.\2/' "$@" ; fi SUFFIXES = .$(LIB_MAN_SUFFIX) .$(MISC_MAN_SUFFIX) .xml