From e6caf5ebdf120426fac27ef8f9691c5d187f8e9e Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 12 Aug 2012 11:35:57 +0200 Subject: [PATCH] [ng] texi: remove workaround for Texinfo 4.1 * lib/am/texibuild.mk (am.texi.build.html): Here. We require Texinfo >= 4.9 anyway. Signed-off-by: Stefano Lattarini --- lib/am/texibuild.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/am/texibuild.mk b/lib/am/texibuild.mk index 0687201e0..1669e309b 100644 --- a/lib/am/texibuild.mk +++ b/lib/am/texibuild.mk @@ -91,13 +91,9 @@ define am.texi.build.html -o $(@:.html=.htp) $<; \ 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; \ + mv $(@:.html=.htp) $@; \ else \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ + rm -rf $(@:.html=.htp) $@; \ exit 1; \ fi endef -- 2.47.2