diff options
| author | Daniel Mack <github@zonque.org> | 2016-01-19 20:44:58 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2016-01-19 20:44:58 +0100 |
| commit | d619a0c4a5bf4f9d5796bcac77160a14e4e24cb6 (patch) | |
| tree | 9682d69502f334740ac2dff701393f5c002f2393 /Makefile.am | |
| parent | d555eb990beea6d61f9e59f80dddd0241687c8a1 (diff) | |
| parent | f23e83b156da8966e43e303dced5439503450d21 (diff) | |
Merge pull request #2373 from keszybz/man-api-build-3
Man page grammar and build tweaks v3
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 9fe7665ab5..cf180048e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -694,29 +694,27 @@ man_MANS = \ noinst_DATA += \ $(HTML_FILES) \ - $(HTML_ALIAS) + $(HTML_ALIAS) \ + docs/html/man +endif CLEANFILES += \ $(man_MANS) \ $(HTML_FILES) \ - $(HTML_ALIAS) + $(HTML_ALIAS) \ + docs/html/man docs/html/man: $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_LN)$(LN_S) -f ../../man $@ -noinst_DATA += \ - docs/html/man - -CLEANFILES += \ - docs/html/man - -if HAVE_PYTHON man/index.html: man/systemd.index.html $(AM_V_LN)$(LN_S) -f systemd.index.html $@ +if HAVE_PYTHON noinst_DATA += \ man/index.html +endif CLEANFILES += \ man/index.html @@ -745,11 +743,6 @@ CLEANFILES += \ man/systemd.index.xml \ man/systemd.directives.xml - -endif - -endif - EXTRA_DIST += \ $(filter-out man/systemd.directives.xml man/systemd.index.xml,$(XML_FILES)) \ tools/make-man-index.py \ @@ -6025,7 +6018,6 @@ EXTRA_DIST += \ $(polkitpolicy_in_in_files) # ------------------------------------------------------------------------------ -if ENABLE_MANPAGES man/custom-entities.ent: configure.ac $(AM_V_GEN)$(MKDIR_P) $(dir $@) $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \ @@ -6073,8 +6065,6 @@ define html-alias $(AM_V_LN)$(LN_S) -f $(notdir $<) $@ endef -endif - EXTRA_DIST += \ man/custom-html.xsl \ man/custom-man.xsl |