Merge 22360/22365: support version 2 of Yodl.

2 files changed, 44 insertions, 21 deletions

diff --git a/Doc/META-FAQ.yo b/Doc/META-FAQ.yo
index 019264601..bfdb76b77 100644
--- a/Doc/META-FAQ.yo
+++ b/Doc/META-FAQ.yo
@@ -1,4 +1,8 @@
+IFDEF(INCWSLEVEL)(\
+INCWSLEVEL()\
+)(\
 STARTDEF()
+)
 INCLUDEFILE(zmacros.yo)
 
 def(startmenu)(0)(DELLINE)
@@ -21,7 +25,7 @@ def(nofill)(1)(ARG1)
 def(startitem)(0)(NEXTLINE DELLINE)
 def(enditem)(0)(DELLINE)
 def(item)(2)(
-      ARG1+USECHARTABLE(indent2)ARG2 DELLINE USECHARTABLE(standard))
+      ARG1+USECHARTABLE(indent2)ARG2 DELLINE +USECHARTABLE(standard))
 
 def(startlist)(0)(DELLINE)
 def(endlist)(0)(DELLINE)
@@ -34,7 +38,11 @@ DEFINECHARTABLE(indent2)(
   '\n' = "\n            "
 )
 
+IFDEF(DECWSLEVEL)(\
+DECWSLEVEL()\
+)(\
 ENDDEF()\
+)\
 ------------------------
 META-FAQ for the Z Shell
 ------------------------
diff --git a/Makefile.in b/Makefile.in
index addd62c30..612d4ed48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,6 +53,9 @@ prep:
 META-FAQ: FORCE
 	@cd Doc && $(MAKE) $(MAKEDEFS) ../META-FAQ
 
+dvi ps html info:
+	@cd Doc && $(MAKE) $(MAKEDEFS) $@
+
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install stripped
@@ -60,8 +63,8 @@ install-strip:
 	$(MAKE) install STRIPFLAGS="-s"
 
 # install/uninstall most things
-install: install.bin install.modules install.man install.fns
-uninstall: uninstall.bin uninstall.modules uninstall.man uninstall.fns
+install: install.bin install.modules install.fns install.man
+uninstall: uninstall.bin uninstall.modules uninstall.fns uninstall.man
 
 # install/uninstall just the binary
 install.bin uninstall.bin:
@@ -77,14 +80,26 @@ install.man uninstall.man:
 
 # install/uninstall just the shell functions
 install.fns:
-	test x$(sitefndir) != xno && $(sdir_top)/mkinstalldirs $(DESTDIR)$(sitefndir)
-	@cd Completion && $(MAKE) $(MAKEDEFS) $@
-	@cd Functions && $(MAKE) $(MAKEDEFS) $@
+	if test x$(fndir) != x && test x$(fndir) != xno; then \
+	  test x$(sitefndir) != xno && \
+	    $(SHELL) $(sdir_top)/mkinstalldirs $(DESTDIR)$(sitefndir); \
+	  sdir_top="$(sdir_top)" fndir="$(fndir)" dir_top="$(dir_top)" \
+	  FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
+	  INSTALL_DATA="$(INSTALL_DATA)" \
+	  INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+	  DESTDIR="$(DESTDIR)" VERSION="$(VERSION)" \
+	  $(SHELL) $(sdir_top)/Config/installfns.sh || exit 1; \
+	fi; \
+	exit 0
 
 uninstall.fns:
-	# never attempt to remove $(sitefndir)
-	@cd Completion && $(MAKE) $(MAKEDEFS) $@
-	@cd Functions && $(MAKE) $(MAKEDEFS) $@
+	if test x$(fndir) != x && test x$(fndir) != xno; then \
+	  fndir="$(fndir)" dir_top="$(dir_top)" \
+	  FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
+	  DESTDIR="$(DESTDIR)" VERSION="$(VERSION)" \
+	  $(SHELL) $(sdir_top)/Config/uninstallfns.sh || exit 1; \
+	fi; \
+	exit 0
 
 # install/uninstall just the info pages
 install.info uninstall.info:
@@ -103,10 +118,7 @@ check test:
 @CLEAN_MK@
 
 distclean-here:
-	@cd Completion && $(MAKE) $(MAKEDEFS) $@
-	@cd Functions && $(MAKE) $(MAKEDEFS) $@
-	@cd Test && $(MAKE) $(MAKEDEFS) $@
-	rm -f Makefile config.h config.status config.log config.cache stamp-h Config/defs.mk
+	rm -f Makefile config.h config.status config.log config.cache config.modules config.modules.sh stamp-h Config/defs.mk
 
 realclean-here:
 	cd $(sdir) && rm -f config.h.in stamp-h.in configure
@@ -117,19 +129,22 @@ realclean-here:
 
 config: config.h
 
-config.status: configure
-	./config.status --recheck
+config.status: $(sdir)/configure
+	$(SHELL) ./config.status --recheck
 
-configure: configure.in aclocal.m4 aczsh.m4
+$(sdir)/configure: $(sdir)/aclocal.m4 $(sdir)/aczsh.m4 $(sdir)/configure.ac
 	cd $(sdir) && autoconf
 
 config.h: stamp-h
-stamp-h: config.h.in config.status
-	cd $(dir_top) && \
-	  CONFIG_FILES= CONFIG_HEADERS=$(subdir)/config.h ./config.status
+stamp-h: $(sdir)/config.h.in config.status
+	cd $(dir_top) && $(SHELL) ./config.status config.h $@
+
+config.modules: $(sdir)/config.h.in config.status
+	cd $(dir_top) && $(SHELL) ./config.status $@
 
-config.h.in: stamp-h.in
-stamp-h.in: configure.in acconfig.h aclocal.m4 aczsh.m4
+$(sdir)/config.h.in: $(sdir)/stamp-h.in
+$(sdir)/stamp-h.in: $(sdir)/configure.ac \
+		$(sdir)/aclocal.m4 $(sdir)/aczsh.m4
 	cd $(sdir) && autoheader
 	echo > $(sdir)/stamp-h.in