From b3b4bce529e76785d7199bb87f0289d090d4171f Mon Sep 17 00:00:00 2001
From: Tanaka Akira <akr@users.sourceforge.net>
Date: Wed, 1 Mar 2000 18:31:21 +0000
Subject: zsh-workers/9961

---
 INSTALL                | 7 +++++++
 Src/Makefile.in        | 5 ++++-
 Test/53completion.ztst | 1 +
 Test/comptest          | 2 +-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/INSTALL b/INSTALL
index ef24ad690..93a9f34ef 100644
--- a/INSTALL
+++ b/INSTALL
@@ -97,6 +97,13 @@ with the list of modules which are to be compiled into the main binary, one
 module name per line with no punctuation and no suffix.  See the zshmodules
 manual page for the list of available modules.
 
+Note that mymods.conf replaces the standard list of linked-in modules from
+Src/xmods.conf.  If you wish to add to the standard list, copy the lines
+that begin with "L " from xmods.conf into mymods.conf and remove the "L "
+from each such line in mymods.conf.  Then add the names of other modules
+that you want to link.  Module names typically must begin with "zsh/";
+only modules appearing in Src/Aliases/*.mdd may omit the "zsh/" prefix.
+
 Note that the modules depending on zle or complete (e.g.: complist and
 deltochar) cannot be loaded dynamically on systems which do not allow symbols
 in one dynamically loaded library to be visible from another; this is true,
diff --git a/Src/Makefile.in b/Src/Makefile.in
index ebe708626..c78e17429 100644
--- a/Src/Makefile.in
+++ b/Src/Makefile.in
@@ -128,7 +128,10 @@ FORCE:
 
 # ========== LINKING IN MODULES ==========
 
-modules-bltin: Makefile
+mymods.conf:
+	@echo Linking with the standard modules.
+
+modules-bltin: Makefile $(sdir)/xmods.conf mymods.conf
 	if test -f mymods.conf; then \
 	    cat mymods.conf > $@; \
 	elif test @D@ = N; then \
diff --git a/Test/53completion.ztst b/Test/53completion.ztst
index f91fe90a3..03226fbe9 100644
--- a/Test/53completion.ztst
+++ b/Test/53completion.ztst
@@ -1,6 +1,7 @@
 # Tests for completion system.
 
 %prep
+  zmodload -i zsh/zpty
 
   comptest () { $ZTST_testdir/../Src/zsh -f $ZTST_srcdir/comptest -z $ZTST_testdir/../Src/zsh -d $ZTST_testdir/compdump.tmp "$@" }
 
diff --git a/Test/comptest b/Test/comptest
index d9c3c40d0..59bd9e60c 100644
--- a/Test/comptest
+++ b/Test/comptest
@@ -1,6 +1,6 @@
 #!/usr/local/bin/zsh -f
 
-zmodload zsh/zpty
+zmodload -i zsh/zpty
 setopt extendedglob
 
 debug=
-- 
cgit 1.4.1