# # # patch "ChangeLog" # from [6c2319e96868ff5fc5a2b177971e692913a52e90] # to [1f1ad49ba72749d16722d248ad9f6561ff09c8d7] # # patch "Makefile.am" # from [2e88f9025e3ffe35d34b1b643909333adf646f60] # to [5481282f4330668a0f83570d784b4a1e881ea4f5] # ============================================================ --- ChangeLog 6c2319e96868ff5fc5a2b177971e692913a52e90 +++ ChangeLog 1f1ad49ba72749d16722d248ad9f6561ff09c8d7 @@ -1,7 +1,14 @@ 2006-03-18 Richard Levitte + * Makefile.am (html): For the html target, figures/ and + std_hooks.lua should always be copied. Making it conditional + should only be done for the monotone.html target. + +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. + (html): 2006-03-18 Matthew Gregan ============================================================ --- Makefile.am 2e88f9025e3ffe35d34b1b643909333adf646f60 +++ Makefile.am 5481282f4330668a0f83570d784b4a1e881ea4f5 @@ -546,10 +546,9 @@ # 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 $@ - if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \ - cp $(srcdir)/std_hooks.lua .; \ - cp -r $(srcdir)/figures $@; \ + cp -r $(srcdir)/figures $@ fi makeinfo --number-sections --html --output $@ $< perl -i.perlbak -pe 's@@\n@' $@/*.html