summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Makefile.in12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 619758ffa..2f43728eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-10-16  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 43692: Doc/Makefile.in: Generate man pages in the build dir,
+	rather than the source dir.
+
 2018-10-15  dana  <dana@dana.is>
 
 	* 43672: Doc/Zsh/redirect.yo: Document result of redirecting
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 9dea79252..71ca52195 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -142,7 +142,7 @@ zsh.info: $(sdir)/zsh.texi
 .yo.1:
 	@case $@ in \
 	  */*) target=$@ ;; \
-	  *) target=$(sdir)/$@ ;; \
+	  *) target=$@ ;; \
 	esac; \
 	case '$(YODL)' in :*) touch $$target ;; *) \
 	    echo $(YODL) -o $$target -I$(sdir):. -w zman.yo version.yo $< ; \
@@ -176,9 +176,9 @@ zsh_toc.html: $(sdir)/zsh.texi texi2html.conf
 	             --init-file texi2html.conf $(sdir)/zsh.texi
 
 zshall.1: zsh.yo
-	@case $@ in \
+	case $@ in \
 	  */*) target=$@ ;; \
-	  *) target=$(sdir)/$@ ;; \
+	  *) target=$@ ;; \
 	esac; \
 	case '$(YODL)' in :*) touch $$target ;; *) \
 	    echo $(YODL) -o $$target -I$(sdir) -DZSHALL -w zman.yo version.yo zsh.yo; \
@@ -203,7 +203,7 @@ runhelp: help.txt
 help.txt: zshbuiltins.1
 	@-rm -f $@ help/*
 	perl $(sdir_top)/Util/helpfiles \
-	    $(sdir)/zshbuiltins.1 help help.txt \
+	    zshbuiltins.1 help help.txt \
 	    || rm -f help.txt help/*
 
 $(MAN): zmacros.yo zman.yo
@@ -328,8 +328,8 @@ uninstall: uninstall.man uninstall.runhelp
 install.man: man
 	${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1
 	for file in $(MAN); do \
-	    test -s $(sdir)/$$file || exit 1; \
-	    $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \
+	    test -s $$file || exit 1; \
+	    $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \
 	done
 .PHONY: install.man