zsh-workers/8827

5 files changed, 21 insertions, 13 deletions

diff --git a/Doc/.cvsignore b/Doc/.cvsignore
index 11b508947..c8a68f7a7 100644
--- a/Doc/.cvsignore
+++ b/Doc/.cvsignore
@@ -1,5 +1,6 @@
 Makefile
 version.yo
+zsh.yo
 zsh*.1
 zsh.texi
 zsh.info*
diff --git a/Doc/.distfiles b/Doc/.distfiles
index 85ecba62c..427ded62c 100644
--- a/Doc/.distfiles
+++ b/Doc/.distfiles
@@ -2,7 +2,7 @@ DISTFILES_SRC='
     .cvsignore .distfiles Makefile.in
     META-FAQ.yo intro.ms
     version.yo zmacros.yo zman.yo ztexi.yo
-    zsh.yo zshbuiltins.yo zshcompctl.yo zshcompsys.yo zshcompwid.yo
+    zsh.yo.in zshbuiltins.yo zshcompctl.yo zshcompsys.yo zshcompwid.yo
     zshexpn.yo zshmisc.yo zshmodules.yo zshoptions.yo zshparam.yo
     zshzftpsys.yo zshzle.yo
     zsh.texi
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 4241a4622..fb1a2cd09 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -35,6 +35,8 @@ sdir            = @srcdir@
 sdir_top        = @top_srcdir@
 INSTALL         = @INSTALL@
 
+tzsh = zsh
+
 @DEFS_MK@
 
 MAKEINFO = makeinfo
@@ -66,20 +68,23 @@ Zsh/seealso.yo Zsh/zftpsys.yo Zsh/zle.yo
 
 # ========== DEPENDENCIES FOR BUILDING ==========
 
-all: $(MAN) zsh.texi zsh.info ../META-FAQ
+all: $(MAN) zsh.texi $(tzsh).info ../META-FAQ
 
 everything: all zsh.dvi zsh_us.ps zsh_a4.ps zsh_toc.html
 
 zsh.dvi: zsh.texi
 	$(TEXI2DVI) $(sdir)/zsh.texi
 
-zsh.info: zsh.texi
+%.info: zsh.texi
 	$(MAKEINFO) $(sdir)/zsh.texi || exit 0
 
 zsh.texi: zsh.yo
 	$(YODL) -o $(sdir)/zsh.texi -I$(sdir) -w ztexi.yo version.yo zsh.yo
 	test -f $(sdir)/zsh.texi
 
+zsh.yo: zsh.yo.in
+	sed 's,@@TEXINFO@@,texinfo\($(tzsh).info\)\($(tzsh)\),' zsh.yo.in >zsh.yo
+
 .yo.1:
 	case $@ in \
 	  */*) target=$@ ;; \
@@ -175,9 +180,9 @@ install.man: $(MAN)
 	done
 
 # install info pages, creating install directory if necessary
-install.info: zsh.info
+install.info: $(tzsh).info
 	$(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir)
-	for file in zsh.info zsh.info-[1-9]*; do \
+	for file in $(tzsh).info $(tzsh).info-[1-9]*; do \
 	  if test -f $$file; then \
 	    $(INSTALL_DATA) $$file $(DESTDIR)$(infodir); \
 	  elif test -f $(sdir)/$$file; then \
@@ -186,7 +191,7 @@ install.info: zsh.info
 	   fi || exit 1; \
 	done
 	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
-	  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/zsh.info; \
+	  install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$(tzsh).info; \
 	else true; fi
 
 install.html: zsh_toc.html
@@ -201,7 +206,7 @@ uninstall.man:
 
 # uninstall info pages
 uninstall.info:
-	rm -f $(DESTDIR)$(infodir)/zsh.info $(DESTDIR)$(infodir)/zsh.info-[1-9]*
+	rm -f $(DESTDIR)$(infodir)/$(tzsh).info $(DESTDIR)$(infodir)/$(tzsh).info-[1-9]*
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
@@ -214,7 +219,7 @@ distclean-here: clean-here
 	rm -f Makefile *.1 *.texi
 
 realclean-here: distclean-here
-	cd $(sdir) && rm -f version.yo ../META-FAQ
+	cd $(sdir) && rm -f version.yo ../META-FAQ zsh.yo
 
 @CLEAN_MK@
 
diff --git a/Makefile.in b/Makefile.in
index 72bc98df9..e28fcec20 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,12 +38,15 @@ INSTALL         = @INSTALL@
 
 @DEFS_MK@
 
+transform = @program_transform_name@
+tzsh = `echo zsh | sed "$(transform)"`
+
 # ========== DEPENDENCIES FOR BUILDING ==========
 
 # default target
 all: config.h
 	@for subdir in Src Doc; do \
-	  (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
+	  (cd $$subdir && $(MAKE) $(MAKEDEFS) tzsh=$(tzsh) $@) || exit 1; \
 	done
 
 check test:
@@ -68,7 +71,7 @@ uninstall: uninstall.bin uninstall.modules uninstall.man uninstall.fns
 
 # install/uninstall just the binary
 install.bin uninstall.bin:
-	@cd Src && $(MAKE) $(MAKEDEFS) $@
+	@cd Src && $(MAKE) $(MAKEDEFS) tzsh=$(tzsh) $@
 
 # install/uninstall just the modules
 install.modules uninstall.modules:
@@ -85,7 +88,7 @@ install.fns uninstall.fns:
 
 # install/uninstall just the info pages
 install.info uninstall.info:
-	@cd Doc && $(MAKE) $(MAKEDEFS) $@
+	@cd Doc && $(MAKE) $(MAKEDEFS) tzsh=$(tzsh) $@
 
 # install/uninstall just the html pages
 install.html uninstall.html:
diff --git a/Src/Makefile.in b/Src/Makefile.in
index b77f08251..77f142262 100644
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -42,8 +42,7 @@ LN		= @LN@
 sdir_src      = $(sdir)
 dir_src       = .
 
-transform=@program_transform_name@
-tzsh=`echo zsh | sed '$(transform)'`
+tzsh = zsh
 
 # ========= DEPENDENCIES FOR BUILDING ==========