diff options
| author | Tim Moore <timoore@redhat.com> | 2010-01-05 15:22:21 +0100 |
|---|---|---|
| committer | Tim Moore <timoore@redhat.com> | 2010-01-05 15:22:21 +0100 |
| commit | 091df18ca8cd329bec8219ce0908a109e25ba1a4 (patch) | |
| tree | 47fcc31c40af1444d277a3baf9de2a5ebe7705aa /doc/beginners | |
| parent | 21e8e579ef10942bf2db3e1514026a6d132b1502 (diff) | |
| parent | 23312a05753e948f7053beccc3dedfbe407a660a (diff) | |
| download | systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.tar.gz systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.tar.xz systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.zip | |
Merge remote branch 'origin/master'
Diffstat (limited to 'doc/beginners')
| -rw-r--r-- | doc/beginners/Makefile.am | 7 | ||||
| -rw-r--r-- | doc/beginners/Makefile.in | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/doc/beginners/Makefile.am b/doc/beginners/Makefile.am index 29ffeaba..e3055967 100644 --- a/doc/beginners/Makefile.am +++ b/doc/beginners/Makefile.am @@ -13,12 +13,13 @@ BEGIN_INSTALL_DIR = $(DOC_INSTALL_DIR)/$(SBG) if BUILD_PUBLICAN all: $(SBG).pdf $(SBG)/index.html +# publican isn't make -j safe. So cheat a little, always create pdf and html +# at the same time, then make html depend on pdf build for copying. $(SBG).pdf: - publican build --formats=pdf --langs=en-US && \ + publican build --formats=pdf,html --langs=en-US && \ mv build/en-US/pdf/*$(SBG)*.pdf $(SBG).pdf -$(SBG)/index.html: - publican build --formats=html --langs=en-US && \ +$(SBG)/index.html: $(SBG).pdf mv build/en-US/html $(SBG) clean-local: diff --git a/doc/beginners/Makefile.in b/doc/beginners/Makefile.in index 2bae95f3..58cfb266 100644 --- a/doc/beginners/Makefile.in +++ b/doc/beginners/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -370,12 +370,13 @@ uninstall-am: uninstall-local @BUILD_PUBLICAN_TRUE@all: $(SBG).pdf $(SBG)/index.html +# publican isn't make -j safe. So cheat a little, always create pdf and html +# at the same time, then make html depend on pdf build for copying. @BUILD_PUBLICAN_TRUE@$(SBG).pdf: -@BUILD_PUBLICAN_TRUE@ publican build --formats=pdf --langs=en-US && \ +@BUILD_PUBLICAN_TRUE@ publican build --formats=pdf,html --langs=en-US && \ @BUILD_PUBLICAN_TRUE@ mv build/en-US/pdf/*$(SBG)*.pdf $(SBG).pdf -@BUILD_PUBLICAN_TRUE@$(SBG)/index.html: -@BUILD_PUBLICAN_TRUE@ publican build --formats=html --langs=en-US && \ +@BUILD_PUBLICAN_TRUE@$(SBG)/index.html: $(SBG).pdf @BUILD_PUBLICAN_TRUE@ mv build/en-US/html $(SBG) @BUILD_PUBLICAN_TRUE@clean-local: |