diff options
Diffstat (limited to 'lib/am/texinfos.am')
| -rw-r--r-- | lib/am/texinfos.am | 53 |
1 files changed, 16 insertions, 37 deletions
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index a2a21e667..a72ec1596 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -191,23 +191,11 @@ install-info-am: $(INFO_DEPS) case $$file in \ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ -## 8+3 filesystems cannot deal with foo.info-N filenames: they all -## conflict. DJGPP comes with a tool, DJTAR, that will rename these -## files to foo.iNN while extracting the archive. DJGPP's makeinfo -## is patched to grok these filenames. However we have to account -## for the renaming when installing the info files. -## -## If $file == foo.info, then $file_i == foo.i. The reason we use two -## shell commands instead of one ('s|\.info$$|.i|') is so that a suffix-less -## 'foo' becomes 'foo.i' too. - file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \ - for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \ - $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \ - if test -f $$ifile; then \ - echo "$$ifile"; \ - else : ; fi; \ - done; \ + if test -f $$file; then \ + echo ./$$file; \ + else \ + echo $(srcdir)/$$file; \ + fi; \ done | $(am__base_list) | \ while read files; do \ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ @@ -321,11 +309,9 @@ uninstall-info-am: @list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ -## DJGPP-style info files. See comment in install-info-am. - relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \ (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \ - echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \ - rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \ + echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile"; \ + rm -f $$relfile; \ else :; fi); \ done @@ -358,16 +344,14 @@ dist-info: $(INFO_DEPS) case $$base in \ $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \ esac; \ - if test -f $$base; then d=.; else d=$(srcdir); fi; \ - base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \ - for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \ - if test -f $$file; then \ -## Strip leading '$$d/'. - relfile=`expr "$$file" : "$$d/\(.*\)"`; \ - test -f "$(distdir)/$$relfile" || \ - cp -p $$file "$(distdir)/$$relfile"; \ - else :; fi; \ - done; \ + if test -f $$base; then \ + file=./$$base; \ + else \ + file=$(srcdir)/$$base; \ + fi; \ + if test -f $$file && test ! -f "$(distdir)/$$base"; then \ + cp -p $$file "$(distdir)/$$base"; \ + fi; \ done endif %?LOCAL-TEXIS% @@ -397,12 +381,7 @@ clean-aminfo: .PHONY maintainer-clean-am: maintainer-clean-aminfo maintainer-clean-aminfo: - @list='$(INFO_DEPS)'; for i in $$list; do \ -## .iNN files are DJGPP-style info files. - i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \ - echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ - rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ - done + -test -z "$(INFO_DEPS)" || rm -f $(INFO_DEPS) ## Use '-rf', not just '-f'; see comments in 'mostlyclean-aminfo' ## above for details. ?MAINTCLEAN? -test -z "%MAINTCLEAN%" \ |