|
From: <sv...@va...> - 2005-12-04 15:00:10
|
Author: sewardj Date: 2005-12-04 15:00:06 +0000 (Sun, 04 Dec 2005) New Revision: 5279 Log: Now that the man page is built from the XML documentation masters, it has to have the same status as the HTML/PDF/PS docs, that is, not built by default because it depends on the ultra-fragile XML toolchain. So make it use the same hacks, that is, build only at 'make dist' time. Modified: trunk/docs/Makefile.am Modified: trunk/docs/Makefile.am =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/docs/Makefile.am 2005-12-04 14:54:31 UTC (rev 5278) +++ trunk/docs/Makefile.am 2005-12-04 15:00:06 UTC (rev 5279) @@ -18,9 +18,7 @@ =20 EXTRA_DIST =3D README =20 -dist_man_MANS =3D valgrind.1 =20 - ##------------------------------------------------------------------- ## Below here is more ordinary make stuff... ##------------------------------------------------------------------- @@ -72,13 +70,12 @@ =20 # the valgrind manpage man-page: - @echo "Generating the valgrind manpage ..." - @if test ! -f $(XSL_MAN_STYLE); then \ - echo "Error: I can't find the file '$(XSL_MAN_STYLE)'"; \ - echo "Please check where it lives on your system, and" \ - "amend the line 'XSL_MAN_STYLE =3D ' in this Makefile."; \ - exit 1; \ - fi; \ + if test ! -f $(XSL_MAN_STYLE); then \ + echo "Error: I can't find the file '$(XSL_MAN_STYLE)'"; \ + echo "Please check where it lives on your system, and" \ + "amend the line 'XSL_MAN_STYLE =3D ' in this Makefile."; \ + exit 1; \ + fi; export XML_CATALOG_FILES=3D$(XML_CATALOG_FILES) && \ $(XSLTPROC) $(XSLTPROC_FLAGS) -o ./ $(XSL_MAN_STYLE) $(myxmldir)/valgri= nd-manpage.xml =20 @@ -121,30 +118,36 @@ # as we intend. install-data-hook: if test -r html ; then \ - mkdir -p $(DESTDIR)$(datadir)/doc/valgrind/; \ - cp -r html $(DESTDIR)$(datadir)/doc/valgrind/; \ + mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \ + cp -r html $(DESTDIR)$(datadir)/doc/valgrind; \ fi ifeq ($(BUILD_ALL_DOCS),yes) if test -r index.pdf ; then \ - mkdir -p $(DESTDIR)$(datadir)/doc/valgrind/; \ + mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \ cp index.pdf $(DESTDIR)$(datadir)/doc/valgrind/valgrind_manual.pdf; \ fi if test -r index.ps ; then \ - mkdir -p $(DESTDIR)$(datadir)/doc/valgrind/; \ + mkdir -p $(DESTDIR)$(datadir)/doc/valgrind; \ cp index.ps $(DESTDIR)$(datadir)/doc/valgrind/valgrind_manual.ps; \ fi + if test -r valgrind.1 ; then \ + mkdir -p $(DESTDIR)$(mandir)/man1; \ + cp valgrind.1 $(DESTDIR)$(mandir)/man1/valgrind.1; \ + fi endif =20 -# This is done at 'make dist' time. It builds the html and print docs -# and copies them into the docs/ directory in the tarball. +# This is done at 'make dist' time. It builds the html docs, print +# docs and man page and copies them into the docs/ directory in the +# tarball. ifeq ($(BUILD_ALL_DOCS),yes) -dist-hook: FAQ.txt html-docs print-docs +dist-hook: FAQ.txt html-docs print-docs man-page cp -r html $(distdir) cp FAQ.txt $(distdir)/.. + cp valgrind.1 $(distdir) cp print/index.pdf $(distdir) cp print/index.ps $(distdir) else -dist-hook: FAQ.txt html-docs +dist-hook: FAQ.txt html-docs man-page cp FAQ.txt $(distdir)/.. cp -r html $(distdir) endif @@ -155,7 +158,10 @@ =20 =20 =20 -# Note: the following three rules are nothing to do with the normal buil= d tree. +# ----------------------------------------------------------------------= - +# Note: the rest of this file is nothing to do with the normal build +# tree. The stuff below contains special targets for web-site +# artefacts. =20 # chunked html with no html/body tags, css, or top nav, to fit into the = website website-docs: |