# # # patch "ChangeLog" # from [462a0dd3b759d4d509d17e87a8005b8acdf9027e] # to [6c2319e96868ff5fc5a2b177971e692913a52e90] # # patch "Makefile.am" # from [a61f337bcc2bf1d209eb7accc833a634207470aa] # to [2e88f9025e3ffe35d34b1b643909333adf646f60] # ============================================================ --- ChangeLog 462a0dd3b759d4d509d17e87a8005b8acdf9027e +++ ChangeLog 6c2319e96868ff5fc5a2b177971e692913a52e90 @@ -1,3 +1,8 @@ +2006-03-18 Richard Levitte + + * Makefile.am (monotone.html, html): Only copy figures/ and + std_hooks.lua if the builder is in a separate build directory. + 2006-03-18 Matthew Gregan * Makefile.am: Fix a couple of cases where documentation was ============================================================ --- Makefile.am a61f337bcc2bf1d209eb7accc833a634207470aa +++ Makefile.am 2e88f9025e3ffe35d34b1b643909333adf646f60 @@ -529,20 +529,28 @@ # automake doesn't build html docs +CHECK_SRCDIR_EQ_BUILDDIR=[ "`cd \"$(srcdir)\"; pwd`" = "`pwd`" -a -f ./monotone.texi ] + monotone.html: monotone.texi version.texi std_hooks.lua texinfo.css - cp -r $(srcdir)/figures . - cp $(srcdir)/std_hooks.lua . + if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \ + cp -r $(srcdir)/figures .; \ + cp $(srcdir)/std_hooks.lua .; \ + fi makeinfo --no-split --no-headers --output $@ --html $< perl -i.perlbak -pe 's@@\n@' $@ rm -f address@hidden - cp $(srcdir)/texinfo.css . + if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \ + cp $(srcdir)/texinfo.css .; \ + fi # The .perlbak thing is needed, otherwise the perl executions fails on MinGW html: monotone.texi version.texi std_hooks.lua texinfo.css - cp $(srcdir)/std_hooks.lua . mkdir -p $@ - cp -r $(srcdir)/figures $@ + if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \ + cp $(srcdir)/std_hooks.lua .; \ + cp -r $(srcdir)/figures $@; \ + fi makeinfo --number-sections --html --output $@ $< perl -i.perlbak -pe 's@@\n@' $@/*.html rm -f $@/*.perlbak