From aaf561724cb50d2f3533a51b2159d3428691171b Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Thu, 2 Dec 1999 22:21:43 +0000
Subject: zsh-workers/8863

---
 Doc/Makefile.in |  2 +-
 Makefile.in     |  8 ++++----
 Src/Makefile.in |  2 +-
 configure.in    | 10 ++++++++++
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index fc974cc45..b35ca33c0 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -35,7 +35,7 @@ sdir            = @srcdir@
 sdir_top        = @top_srcdir@
 INSTALL         = @INSTALL@
 
-tzsh = zsh
+tzsh = @tzsh@
 
 @DEFS_MK@
 
diff --git a/Makefile.in b/Makefile.in
index e28fcec20..2724ba5a8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,14 +39,14 @@ INSTALL         = @INSTALL@
 @DEFS_MK@
 
 transform = @program_transform_name@
-tzsh = `echo zsh | sed "$(transform)"`
+tzsh = @tzsh@
 
 # ========== DEPENDENCIES FOR BUILDING ==========
 
 # default target
 all: config.h
 	@for subdir in Src Doc; do \
-	  (cd $$subdir && $(MAKE) $(MAKEDEFS) tzsh=$(tzsh) $@) || exit 1; \
+	  (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
 	done
 
 check test:
@@ -71,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) tzsh=$(tzsh) $@
+	@cd Src && $(MAKE) $(MAKEDEFS) $@
 
 # install/uninstall just the modules
 install.modules uninstall.modules:
@@ -88,7 +88,7 @@ install.fns uninstall.fns:
 
 # install/uninstall just the info pages
 install.info uninstall.info:
-	@cd Doc && $(MAKE) $(MAKEDEFS) tzsh=$(tzsh) $@
+	@cd Doc && $(MAKE) $(MAKEDEFS) $@
 
 # install/uninstall just the html pages
 install.html uninstall.html:
diff --git a/Src/Makefile.in b/Src/Makefile.in
index 3589e30ad..1cff00435 100644
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -42,7 +42,7 @@ LN		= @LN@
 sdir_src      = $(sdir)
 dir_src       = .
 
-tzsh = zsh
+tzsh = @tzsh@
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
diff --git a/configure.in b/configure.in
index de8d06dc0..c39de8b20 100644
--- a/configure.in
+++ b/configure.in
@@ -48,6 +48,15 @@ dnl -----------------------------
 dnl Handle --program-prefix, --program-suffix, etc.
 AC_ARG_PROGRAM
 
+u_ptn=`make -f - <<EOF
+all:
+	@echo ${program_transform_name}
+EOF
+`
+tzsh=`echo zsh | sed -e "${u_ptn}"`
+
+AC_SUBST(tzsh)dnl
+
 dnl Do you want to debug zsh?
 undefine([zsh-debug])dnl
 AC_ARG_ENABLE(zsh-debug,
@@ -1601,5 +1610,6 @@ info install path         : ${zshinfo}"
 if test "$zshfndir" != no; then
 echo "functions install path    : ${zshfndir}
 installed functions       : ${FUNCTIONS_INSTALL}
+binary/info base name     : ${tzsh}
 "
 fi
-- 
cgit 1.4.1