# # # patch "ChangeLog" # from [94404d71e163ab924478003a8f3156c0b6e1286b] # to [2db66104ccb8dc2f4be74731787dedd269eb6173] # # patch "Makefile.am" # from [ae50b8ef6739aaa422ced45c303ad6c355a9bd7e] # to [5884f6fd4601a203b275926a9d008ad98fc687ba] # ============================================================ --- ChangeLog 94404d71e163ab924478003a8f3156c0b6e1286b +++ ChangeLog 2db66104ccb8dc2f4be74731787dedd269eb6173 @@ -1,3 +1,9 @@ +2006-03-18 Matthew Gregan + + * Makefile.am: Copy figures/ into two places for html target, and + don't attempt to copy std_hooks.lua over itself if we're building + in the src dir. + 2006-03-18 Richard Levitte * Makefile.am (html): For the html target, figures/ and ============================================================ --- Makefile.am ae50b8ef6739aaa422ced45c303ad6c355a9bd7e +++ Makefile.am 5884f6fd4601a203b275926a9d008ad98fc687ba @@ -546,11 +546,14 @@ # 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 . + if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \ + cp -r $(srcdir)/figures .; \ + cp $(srcdir)/std_hooks.lua .; \ + fi mkdir -p $@ - cp -r $(srcdir)/figures $@ makeinfo --number-sections --html --output $@ $< perl -i.perlbak -pe 's@@\n@' $@/*.html rm -f $@/*.perlbak + cp -r $(srcdir)/figures $@ cp $(srcdir)/texinfo.css $@