Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: Install Failure



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



Messages sorted by: Reverse Date, Date, Thread, Author