summaryrefslogtreecommitdiff
path: root/Doc
diff options
context:
space:
mode:
authorAxel Beckert <abe@deuxchevaux.org>2018-09-11 00:41:19 +0200
committerAxel Beckert <abe@deuxchevaux.org>2018-09-11 00:41:19 +0200
commitb531f38d5c75078478f2eaa0b714cc08afa6fce2 (patch)
treec31812913cefe3b80b8c4abcbfa05516091c1628 /Doc
parenta04e81b62565a21b0c613115e57f983e7c56d35e (diff)
parentb3239c5e40eea0a73992160c5619b7d191ede490 (diff)
downloadzsh-b531f38d5c75078478f2eaa0b714cc08afa6fce2.tar.gz
zsh-b531f38d5c75078478f2eaa0b714cc08afa6fce2.zip
Merge tag 'zsh-5.6.1' into debian
Patch release: 5.6.1
Diffstat (limited to 'Doc')
-rw-r--r--Doc/Makefile.in13
1 files changed, 6 insertions, 7 deletions
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index fded2e825..9dea79252 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -201,11 +201,10 @@ runhelp: help.txt
.PHONY: runhelp
help.txt: zshbuiltins.1
- @-rm -f $(sdir)/help.txt $(sdir)/help/*
+ @-rm -f $@ help/*
perl $(sdir_top)/Util/helpfiles \
- $(sdir)/zshbuiltins.1 $(sdir)/help $(sdir)/help.txt \
- || rm -f $(sdir)/help.txt $(sdir)/help/*
- touch $(sdir)/$@
+ $(sdir)/zshbuiltins.1 help help.txt \
+ || rm -f help.txt help/*
$(MAN): zmacros.yo zman.yo
@@ -338,11 +337,11 @@ install.man: man
install.runhelp: $(runhelp)
if test x"$(runhelpdir)" != x""; then \
${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(runhelpdir); \
- $(INSTALL_DATA) $(sdir)/help/* $(DESTDIR)$(runhelpdir); \
+ $(INSTALL_DATA) help/* $(DESTDIR)$(runhelpdir); \
while read from to; do \
rm -f $(DESTDIR)$(runhelpdir)/$$to || : ; \
$(LN_S) $$from $(DESTDIR)$(runhelpdir)/$$to; \
- done < $(sdir)/help.txt; \
+ done < help.txt; \
fi
.PHONY: install.runhelp
@@ -419,7 +418,7 @@ distclean-here: clean-here
realclean-here: distclean-here
cd $(sdir) && rm -f Zsh/modlist.yo Zsh/modmenu.yo Zsh/manmodmenu.yo
cd $(sdir) && rm -f version.yo ../META-FAQ zsh.texi $(MAN)
- cd $(sdir) && rm -f help.txt help/*
+ rm -f help.txt help/*
.PHONY: realclean-here
@CLEAN_MK@