diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-09-07 00:06:47 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2018-09-07 10:13:36 +0000 |
| commit | b2ddd97175c838761b55c11187f12bb6edeee4be (patch) | |
| tree | c46488e349e2438297abb147b85c9f3b41bcdbca | |
| parent | 85ae84e89583dfff54905c4632b03bcdc0aa1a79 (diff) | |
| download | zsh-b2ddd97175c838761b55c11187f12bb6edeee4be.tar.gz zsh-b2ddd97175c838761b55c11187f12bb6edeee4be.tar.xz zsh-b2ddd97175c838761b55c11187f12bb6edeee4be.zip | |
43404 (after 43392): Fix 'make install' in out-of-tree builds
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Doc/Makefile.in | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 053eb0013..604170534 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-09-07 Daniel Shahaf <d.s@daniel.shahaf.name> + + * 43404 (after 43392): Doc/Makefile.in: Fix 'make install' + in out-of-tree builds + 2018-09-06 Daniel Shahaf <d.s@daniel.shahaf.name> * 43392: Doc/Makefile.in, Etc/creating-a-release.txt: dist: diff --git a/Doc/Makefile.in b/Doc/Makefile.in index 35011091b..9dea79252 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -337,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 @@ -418,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@ |