summaryrefslogtreecommitdiffstats
path: root/doc/beginners/Makefile.am
diff options
context:
space:
mode:
authorTim Moore <timoore@redhat.com>2010-01-05 15:22:21 +0100
committerTim Moore <timoore@redhat.com>2010-01-05 15:22:21 +0100
commit091df18ca8cd329bec8219ce0908a109e25ba1a4 (patch)
tree47fcc31c40af1444d277a3baf9de2a5ebe7705aa /doc/beginners/Makefile.am
parent21e8e579ef10942bf2db3e1514026a6d132b1502 (diff)
parent23312a05753e948f7053beccc3dedfbe407a660a (diff)
downloadsystemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.tar.gz
systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.tar.xz
systemtap-steved-091df18ca8cd329bec8219ce0908a109e25ba1a4.zip
Merge remote branch 'origin/master'
Diffstat (limited to 'doc/beginners/Makefile.am')
-rw-r--r--doc/beginners/Makefile.am7
1 files changed, 4 insertions, 3 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: