[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[FYI] {maint} texi: remove workaround for older Texinfo (4.1)
From: |
Stefano Lattarini |
Subject: |
[FYI] {maint} texi: remove workaround for older Texinfo (4.1) |
Date: |
Fri, 4 Jan 2013 01:06:17 +0100 |
* 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 <address@hidden>
---
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.
--
1.8.1.rc3.27.g3b73c7d
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [FYI] {maint} texi: remove workaround for older Texinfo (4.1),
Stefano Lattarini <=