# # # patch "ChangeLog" # from [670275e76de6bbc2dff9c91d4be04fe3cb6e7093] # to [a44b727c1fa2417ec5c8622d57becc68f4a0b20a] # # patch "Makefile.am" # from [5884f6fd4601a203b275926a9d008ad98fc687ba] # to [a3481fde5e09006a7b9d86ce007f7a214cbb40ad] # ============================================================ --- ChangeLog 670275e76de6bbc2dff9c91d4be04fe3cb6e7093 +++ ChangeLog a44b727c1fa2417ec5c8622d57becc68f4a0b20a @@ -1,3 +1,8 @@ +2006-03-19 Matthew Gregan + + * Makefile.am: Tidier versions of html and monotone.html targets, + thanks to Thomas Moschny for the patch. + 2006-03-18 Matthew Gregan * automate.cc (automate_inventory): Add an MM(). ============================================================ --- Makefile.am 5884f6fd4601a203b275926a9d008ad98fc687ba +++ Makefile.am a3481fde5e09006a7b9d86ce007f7a214cbb40ad @@ -534,26 +534,22 @@ monotone.html: monotone.texi version.texi std_hooks.lua texinfo.css if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \ cp -r $(srcdir)/figures .; \ - cp $(srcdir)/std_hooks.lua .; \ + cp $(srcdir)/texinfo.css .; \ fi - makeinfo --no-split --no-headers --output $@ --html $< + makeinfo -I $(srcdir) --no-split --no-headers --output $@ --html $< perl -i.perlbak -pe 's@@\n@' $@ rm -f address@hidden - 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 if $(CHECK_SRCDIR_EQ_BUILDDIR); then :; else \ cp -r $(srcdir)/figures .; \ - cp $(srcdir)/std_hooks.lua .; \ fi mkdir -p $@ - makeinfo --number-sections --html --output $@ $< + cp -r $(srcdir)/figures $@ + cp $(srcdir)/texinfo.css $@ + makeinfo -I $(srcdir) --number-sections --html --output $@ $< perl -i.perlbak -pe 's@@\n@' $@/*.html rm -f $@/*.perlbak - cp -r $(srcdir)/figures $@ - cp $(srcdir)/texinfo.css $@