From 6a67b29744ba72ff9ed6a12349a65b1e4a23f3a6 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 3 Jan 2013 23:10:42 +0100 Subject: [PATCH] texi: remove workaround for older Texinfo (4.1) * lib/am/texibuild.am: Here, in the rules generating HTML output. We can do so because, since Automake 1.13, we require Texinfo >= 4.9 anyway. Basically a backport of Automake-NG commit '1.12.2-879-ge6caf5e'. Signed-off-by: Stefano Lattarini --- lib/am/texibuild.am | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index 3256fde..a59d443 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -110,15 +110,9 @@ INFO_DEPS += %DEST_INFO_PREFIX%%DEST_SUFFIX% ?GENERIC? -o $(@:.html=.htp) %SOURCE%; \ ?!GENERIC? -o $(@:.html=.htp) `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \ then \ - rm -rf $@; \ -## Work around a bug in Texinfo 4.1 (-o foo.html outputs files in foo/ -## instead of foo.html/). - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + rm -rf $@ && mv $(@:.html=.htp) $@; \ else \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ - exit 1; \ + rm -rf $(@:.html=.htp); exit 1; \ fi ## If we are using the generic rules, we need separate dependencies. -- 2.7.4