From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: zsh-workers-return-43404-ml=inbox.vuxu.org@zsh.org X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham autolearn_force=no version=3.4.1 Received: from primenet.com.au (ns1.primenet.com.au [203.24.36.2]) by inbox.vuxu.org (OpenSMTPD) with ESMTP id 8ed7ad8a for ; Fri, 7 Sep 2018 00:07:09 +0000 (UTC) Received: (qmail 8044 invoked by alias); 7 Sep 2018 00:06:56 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: List-Unsubscribe: X-Seq: 43404 Received: (qmail 12644 invoked by uid 1010); 7 Sep 2018 00:06:56 -0000 X-Qmail-Scanner-Diagnostics: from out1-smtp.messagingengine.com by f.primenet.com.au (envelope-from , uid 7791) with qmail-scanner-2.11 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1. Clear:RC:0(66.111.4.25):SA:0(-2.6/5.0):. Processed in 2.299601 secs); 07 Sep 2018 00:06:56 -0000 X-Envelope-From: d.s@daniel.shahaf.name X-Qmail-Scanner-Mime-Attachments: | X-Qmail-Scanner-Zip-Files: | DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm1; bh=4/nEsooDjiLVVz045LJcX/m2ryV1/ pgI3dgR9xASabs=; b=XjYiU16HrLp7ZWsrZOvXHxqpbmg+JsXE9+imyy+tjcOZ/ qu8aZiA3lKFmlDPCoxYhFrntjWvdP3Yq+ICjl3Fnp2Zb3wUbG1Dtg6VR8nTsaEy+ ps3lDefGBzhR5jXOk52Zjf/O0NK/myJoeMwf/2OqTZbOfmbVzp/B5pQPPmtqSwOZ 0mxWJt+i+znUhgZZ5ixrctIVC4KfCrgCOcOSrUUm2NkUbzGvxtsXp3AtlzoT2muy 98FeWeW5mNFRu2gYwipPd2RInGEFO0uTaJxhiRUR5nFpERGILbNptJfdUafwMan8 j/IYvS1KE8UWpJ2i/kRKg4JVQaEDwT5s85jlPpF/g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=4/nEsooDjiLVVz045LJcX/m2ryV1/ pgI3dgR9xASabs=; b=iFpYST41TPMi2Gz8V5LTYBmSP78IC98ak9/ewJ/LyQcqD Xe0vCnIyb0cpnSs0K80LhTH9aTpkn1xdoUdeczAzfruGtZoWCxCi0WoM+PDqiWfz b+lLaUlgB1LRvSj84+IOZnJMU9pndYwWm4MV1mhW5EZiNimG9YIelsf2QNAGfpVG VNQQ8S5fiUMijk56jGPpPNIfFpkcTAvCH3puhep9rZX4M93vAJWh1ud+Unn+61sx ZnK064wG+Vf1+6KwmfSdDkoTiJsWwC9A2Frf8YOXcEg4SMW2h6D4QfoidOVj4PwI QBykMWa4wo38zh67gWsT8Qpqw9N9+jG4yYHrsKRuQ== X-ME-Proxy: X-ME-Sender: Date: Fri, 7 Sep 2018 00:06:47 +0000 From: Daniel Shahaf To: Vin Shelton Cc: Zsh Hackers' List Subject: Re: Install Failure Message-ID: <20180907000647.m66lo7j4ymtxamec@tarpaulin.shahaf.local2> References: <1536271038.4025623.1499512728.307A5091@webmail.messagingengine.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20170113 (1.7.2) 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