projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'micro' into maint
[platform/upstream/automake.git]
/
lib
/
am
/
texibuild.am
diff --git
a/lib/am/texibuild.am
b/lib/am/texibuild.am
index
0fe09b1
..
a59d443
100644
(file)
--- a/
lib/am/texibuild.am
+++ b/
lib/am/texibuild.am
@@
-1,5
+1,5
@@
## automake - create Makefile.in from Makefile.am
## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994-201
2
Free Software Foundation, Inc.
+## Copyright (C) 1994-201
3
Free Software Foundation, Inc.
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@@
-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 \
?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 \
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.
fi
## If we are using the generic rules, we need separate dependencies.