From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Vin Shelton <acs@alumni.princeton.edu>
Cc: Zsh Hackers' List <zsh-workers@zsh.org>
Subject: Re: Install Failure
Date: Fri, 7 Sep 2018 00:06:47 +0000 [thread overview]
Message-ID: <20180907000647.m66lo7j4ymtxamec@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <CACeGjnWrsDwkOtZCkvW-9rDwtX0eyhqkNJKAgYg33wWfX01tAQ@mail.gmail.com>
Vin Shelton wrote on Thu, Sep 06, 2018 at 18:18:19 -0400:
> make
> make install
>
> If I had to guess, your source directory is not completely fresh and
> ../../../src/zsh-2018-09-06/Doc/help/* already exists.
No, I got that part right. I just missed something in my grep.
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@
We still need to do a 5.6.1 to add Doc/help/* to the tarball. (The jobs
thing looks like it'll take a while to fix and stabilize so I'm not
inclined to wait for it.) Can I tag on Friday, or should we wait a bit
longer?
Daniel
prev parent reply other threads:[~2018-09-07 0:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-06 21:20 Vin Shelton
2018-09-06 21:57 ` Daniel Shahaf
2018-09-06 22:18 ` Vin Shelton
2018-09-07 0:06 ` Daniel Shahaf [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180907000647.m66lo7j4ymtxamec@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=acs@alumni.princeton.edu \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).