Regenerated all Makefile.SH files.

git-svn-id: svn://svn.code.sf.net/p/dist/code/trunk/dist@10 2592e710-e01b-42a5-8df0-11608a6cc53d

10 files changed, 633 insertions, 409 deletions

diff --git a/Makefile.SH b/Makefile.SH
index 2b54336..725cf8c 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1,5 +1,6 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL55]
-: $X-Id: Jmake.tmpl,v 3.0.1.2 1995/01/11 14:50:21 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
+
 case $CONFIG in
 '')
 	if test -f config.sh; then TOP=.;
@@ -21,6 +22,7 @@ DIR=`echo $CURRENT/ | sed -e 's/\.\///g'`
 echo "Extracting ${DIR}Makefile (with variable substitutions)"
 
 INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'`
+INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'`
 DATE=`date`
 
 $spitshell >Makefile <<!GROK!THIS!
@@ -33,14 +35,15 @@ TOP = .
 CURRENT = $CURRENT
 DIR = $DIR
 INSTALL = $INSTALL
+INSTALLDIR = $INSTALLDIR
 
 ########################################################################
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
+JCPPFLAGS = $cppflags
 L = $manext
 MANSRC = $installmansrc
-MAKE = make
 MV = $mv
 RM = $rm -f
 
@@ -53,14 +56,15 @@ SUBDIRS = bin mcon jmake pat kit lib
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.3 1995/03/21 08:35:28 ram Exp ram $
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
+
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.2 1995/07/25 13:29:41 ram Exp ram $
+# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -84,30 +88,34 @@ depend::
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in bin mcon pat jmake kit ;\
 	do \
-	(cd $$i ; echo "Depending" "in $(DIR)$$i..."; \
-	$(MAKE) $(MFLAGS)  depend); \
+		(cd $$i ; echo "Depending" "in $(DIR)$$i..."; \
+			$(MAKE) $(MFLAGS)  depend) || exit 1; \
 	done
 
 local_clobber::
 	$(RM) install
 
-install.man:: dist.man
-	$(INSTALL) -c -m 444 dist.man $(MANSRC)/dist.$(L)
+local_install.man:: dist.man
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \
+	$(INSTALL) -c -m 444 dist.man $(INSTALL_PREFIX)$(MANSRC)/dist.$(L)
 
-deinstall.man::
-	$(RM) $(MANSRC)/dist.$(L)
+local_deinstall.man::
+	$(RM) $(INSTALL_PREFIX)$(MANSRC)/dist.$(L)
 
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: sub_clean local_clean
 realclean: sub_realclean local_realclean
 clobber: sub_clobber local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 	$(RM) -r UU
@@ -117,15 +125,36 @@ local_clobber:: local_realclean
 	$(RM) -r .config
 	$(RM) Makefile
 
+install:: local_install sub_install
+install.man:: maybe_install.man sub_install.man
+deinstall:: sub_deinstall local_deinstall
+deinstall.man:: sub_deinstall.man maybe_deinstall.man
+
+install.man-yes: local_install.man
+install.man-no:
+deinstall.man-yes: local_deinstall.man
+deinstall.man-no:
+
+!NO!SUBS!
+case "$installmansrc" in
+'') man=no;;
+*) man=yes;;
+esac
+$spitshell >>Makefile <<!GROK!THIS!
+maybe_install.man: install.man-$man
+maybe_deinstall.man: deinstall.man-$man
+!GROK!THIS!
+$spitshell >>Makefile <<'!NO!SUBS!'
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
-	if test -f Makefile.SH; then \
-	echo "	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
-	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
-	fi; \
-	echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
-	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+		if test -f Makefile.SH; then \
+			echo "	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
+			$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
+		fi; \
+		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
+		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -144,21 +173,23 @@ subdirs:
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS) ;\
 	do \
-	(cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
-	$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \
+		(cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
+			$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \
 	done
 
-install::
+sub_install::
 	@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
 
-deinstall::
+sub_deinstall::
 	@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall...
 
-install.man::
+sub_install.man::
 	@$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS=
 
-deinstall.man::
+sub_deinstall.man::
 	@$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall.man...
 
 sub_clean::
 	@$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS=
@@ -176,42 +207,51 @@ tag::
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS) ;\
 	do \
-	(cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
-	$(MAKE) $(MFLAGS)  tag); \
+		(cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
+			$(MAKE) $(MFLAGS)  tag) || exit 1; \
 	done
 
 Makefiles::
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS);\
 	do \
-	echo "Making "Makefiles" in $(DIR)$$i..."; \
-	(cd $$i || exit 1; \
-	if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
-	$(MAKE) $(MFLAGS) Makefiles) \
+		echo "Making "Makefiles" in $(DIR)$$i..."; \
+		(cd $$i || exit 1; \
+		if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
+		$(MAKE) $(MFLAGS) Makefiles) || exit 1;\
 	done
 
 Makefiles.SH:: Makefile.SH
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS);\
 	do \
-	case "$(DIR)$$i/" in \
-	*/*/*/*/) newtop=../../../..;; \
-	*/*/*/) newtop=../../..;; \
-	*/*/) newtop=../..;; \
-	*/) newtop=..;; \
-	esac; \
-	case "$(TOP)" in \
-	/*) newtop="$(TOP)" ;; \
-	esac; \
-	echo "Making Makefiles.SH in $(DIR)$$i..."; \
-	(cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \
-	Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\
-	$(MAKE) $(MFLAGS) Makefiles.SH) \
+		case "$(DIR)$$i/" in \
+		*/*/*/*/) newtop=../../../..;; \
+		*/*/*/) newtop=../../..;; \
+		*/*/) newtop=../..;; \
+		*/) newtop=..;; \
+		esac; \
+		case "$(TOP)" in \
+		/*) newtop="$(TOP)" ;; \
+		esac; \
+		echo "Making Makefiles.SH in $(DIR)$$i..."; \
+		(cd $$i || exit 1; \
+			if test -f Jmakefile; then \
+				$(MAKE) $(MFLAGS) -f ../Makefile \
+					Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \
+				$(MAKE) $(MFLAGS) Makefiles.SH; \
+			fi; \
+		) || exit 1; \
 	done
 
 all::
 	@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
 
+local_install::
+local_deinstall::
+local_install.man::
+local_deinstall.man::
+
 !NO!SUBS!
 chmod 644 Makefile
 $eunicefix Makefile
diff --git a/bin/Makefile.SH b/bin/Makefile.SH
index 977ce80..35630ec 100755
--- a/bin/Makefile.SH
+++ b/bin/Makefile.SH
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44]
-: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
 
 case $CONFIG in
 '')
@@ -22,6 +22,7 @@ DIR=`echo $CURRENT/ | sed -e 's/\.\///g'`
 echo "Extracting ${DIR}Makefile (with variable substitutions)"
 
 INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'`
+INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'`
 DATE=`date`
 
 $spitshell >Makefile <<!GROK!THIS!
@@ -34,15 +35,15 @@ TOP = ..
 CURRENT = $CURRENT
 DIR = $DIR
 INSTALL = $INSTALL
+INSTALLDIR = $INSTALLDIR
 
 ########################################################################
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
+JCPPFLAGS = $cppflags
 L = $manext
 MANSRC = $installmansrc
-MAKE = make
-MKDEP = $mkdep \$(DPFLAGS) --
 MV = $mv
 RM = $rm -f
 SCRIPTDIR = $installscript
@@ -57,22 +58,15 @@ SCRIPTS =  \$(BIN)
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $
-
-########################################################################
-# Force 'make depend' to be performed first -- do not edit
-
-.FORCE_DEPEND::
-
-all:: .FORCE_DEPEND
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:42:53 ram Exp ram $
+# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -105,34 +99,40 @@ manilist: manilist.SH
 	/bin/sh manilist.SH
 
 
-install:: $(SCRIPTS) $(LSCRIPTS)
-	@for file in $(SCRIPTS) $(LSCRIPTS); do \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		(set -x; $(INSTALL) -c -m 555 $$file $(SCRIPTDIR)); \
+local_install:: $(SCRIPTS) $(LSCRIPTS)
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+	for file in $(SCRIPTS) $(LSCRIPTS); do \
+		(set -x; \
+		$(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)) || \
+		exit 1; \
 	done
 
-deinstall::
+local_deinstall::
 	@for file in $(SCRIPTS) $(LSCRIPTS); do \
 		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		(set -x; $(RM) $(SCRIPTDIR)/$$file); \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/$$file); \
 	done
 
-install.man::
-	@if test "$(MANSRC)"; then \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		for file in $(SCRIPTS); do \
+local_install.man::
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \
+	for file in $(SCRIPTS); do \
+		if test -f $$file.man; then \
 			(set -x; \
-			$(INSTALL) -c -m 444 $$file.man $(MANSRC)/$$file.$(L)); \
-		done; \
-	else exit 0; fi
+			$(INSTALL) -c -m 444 $$file.man \
+				$(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)) || \
+				exit 1; \
+		fi; \
+	done
 
-deinstall.man::
-	@if test "$(MANSRC)"; then \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		for file in $(SCRIPTS); do \
-			(set -x; $(RM) $(MANSRC)/$$file.$(L)); \
-		done; \
-	else exit 0; fi
+local_deinstall.man::
+	case '${MFLAGS}' in *[i]*) set +e;; esac; \
+	for file in $(SCRIPTS); do \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)); \
+	done
 
 BINSH = \
 	packinit.SH \
@@ -150,20 +150,42 @@ depend::
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: local_clean
 realclean: local_realclean
 clobber: local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install
+install.man:: maybe_install.man
+deinstall:: local_deinstall
+deinstall.man:: maybe_deinstall.man
+
+install.man-yes: local_install.man
+install.man-no:
+deinstall.man-yes: local_deinstall.man
+deinstall.man-no:
+
+!NO!SUBS!
+case "$installmansrc" in
+'') man=no;;
+*) man=yes;;
+esac
+$spitshell >>Makefile <<!GROK!THIS!
+maybe_install.man: install.man-$man
+maybe_deinstall.man: deinstall.man-$man
+!GROK!THIS!
+$spitshell >>Makefile <<'!NO!SUBS!'
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
 		if test -f Makefile.SH; then \
@@ -172,7 +194,7 @@ Makefile.SH: Jmakefile
 		fi; \
 		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
 		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -187,29 +209,22 @@ local_clobber::
 ########################################################################
 # Empty rules for directories with no sub-directories -- do not edit
 
-install::
+local_install::
 	@echo "install in $(CURRENT) done."
 
-deinstall::
+local_deinstall::
 	@echo "deinstall in $(CURRENT) done."
 
-install.man::
+local_install.man::
 	@echo "install.man in $(CURRENT) done."
 
-deinstall.man::
+local_deinstall.man::
 	@echo "deinstall.man in $(CURRENT) done."
 
 Makefiles::
 
 Makefiles.SH::
 
-########################################################################
-# Dependencies generated by make depend
-# DO NOT DELETE THIS LINE -- make depend relies on it
-
-# Put nothing here or make depend will gobble it up
-.FORCE_DEPEND::
-	@echo "You must run 'make depend' in $(TOP) first."; exit 1
 !NO!SUBS!
 chmod 644 Makefile
 $eunicefix Makefile
diff --git a/jmake/Makefile.SH b/jmake/Makefile.SH
index e562274..6a651e3 100755
--- a/jmake/Makefile.SH
+++ b/jmake/Makefile.SH
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL70]
-: $X-Id: Jmake.tmpl,v 3.0.1.3 1997/02/28 14:56:16 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
 
 case $CONFIG in
 '')
@@ -41,6 +41,7 @@ INSTALLDIR = $INSTALLDIR
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
+JCPPFLAGS = $cppflags
 L = $manext
 MANSRC = $installmansrc
 MV = $mv
@@ -58,15 +59,15 @@ SCRIPTS =  jmake jmkmf
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.7 2004/08/22 08:28:58 ram Exp ram $
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.2 1995/03/21 08:34:16 ram Exp ram $
+# $X-Id: Jmakefile 3 2006-08-25 21:39:07Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -106,12 +107,13 @@ jmkmf: jmkmf.SH
 
 
 local_install:: $(SCRIPTS) $(LSCRIPTS)
-	case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
 	for file in $(SCRIPTS) $(LSCRIPTS); do \
 		(set -x; \
-		$(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+		$(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)) || \
+		exit 1; \
 	done
 
 local_deinstall::
@@ -121,14 +123,15 @@ local_deinstall::
 	done
 
 local_install.man::
-	case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \
 	for file in $(SCRIPTS); do \
 		if test -f $$file.man; then \
 			(set -x; \
 			$(INSTALL) -c -m 444 $$file.man \
-				$(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)); \
+				$(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)) || \
+				exit 1; \
 		fi; \
 	done
 
@@ -151,22 +154,20 @@ fixcpp: fixcpp.SH
 
 
 local_install::
-
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
 	for dir in $(PRIVLIB) $(PRIVLIB)/files; do	\
-	(set -x; test -d $(INSTALL_PREFIX)$$dir || \
+		(set -x; test -d $(INSTALL_PREFIX)$$dir || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$$dir);	\
 	done
 
 local_deinstall::
-
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
 	for dir in $(PRIVLIB) $(PRIVLIB)/files; do \
 		(set -x; test -d $$dir && $(RM) -r $(INSTALL_PREFIX)$$dir); \
 	done
 
 local_install:: Index
-	case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \
 	$(INSTALL) -c -m 444 Index $(INSTALL_PREFIX)$(PRIVLIB)
@@ -175,7 +176,7 @@ local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(PRIVLIB)/Index
 
 local_install:: bindex
-	case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \
 	$(INSTALL) -c -m 555  bindex $(INSTALL_PREFIX)$(PRIVLIB)
@@ -184,7 +185,7 @@ local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(PRIVLIB)/bindex
 
 local_install:: fixcpp
-	case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/files || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/files); \
 	$(INSTALL) -c -m 555  fixcpp $(INSTALL_PREFIX)$(PRIVLIB)/files
@@ -193,11 +194,12 @@ local_deinstall::
 	$(RM) $(INSTALL_PREFIX)$(PRIVLIB)/files/fixcpp
 
 local_install:: files/Jmake*
-	case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
 	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/files || \
 		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/files); \
 	for i in files/Jmake*; do \
-		(set -x; $(INSTALL) -c -m 444 $$i $(INSTALL_PREFIX)$(PRIVLIB)/files); \
+		(set -x; $(INSTALL) -c -m 444 \
+			$$i $(INSTALL_PREFIX)$(PRIVLIB)/files) || exit 1;\
 	done
 
 local_deinstall::
@@ -220,24 +222,25 @@ depend::
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: local_clean
 realclean: local_realclean
 clobber: local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
-install: local_install
-install.man: maybe_install.man
-deinstall: local_deinstall
-deinstall.man: maybe_deinstall.man
+install:: local_install
+install.man:: maybe_install.man
+deinstall:: local_deinstall
+deinstall.man:: maybe_deinstall.man
 
 install.man-yes: local_install.man
 install.man-no:
diff --git a/kit/Makefile.SH b/kit/Makefile.SH
index bde4076..eacff2c 100755
--- a/kit/Makefile.SH
+++ b/kit/Makefile.SH
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44]
-: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
 
 case $CONFIG in
 '')
@@ -22,6 +22,7 @@ DIR=`echo $CURRENT/ | sed -e 's/\.\///g'`
 echo "Extracting ${DIR}Makefile (with variable substitutions)"
 
 INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'`
+INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'`
 DATE=`date`
 
 $spitshell >Makefile <<!GROK!THIS!
@@ -34,15 +35,15 @@ TOP = ..
 CURRENT = $CURRENT
 DIR = $DIR
 INSTALL = $INSTALL
+INSTALLDIR = $INSTALLDIR
 
 ########################################################################
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
+JCPPFLAGS = $cppflags
 L = $manext
 MANSRC = $installmansrc
-MAKE = make
-MKDEP = $mkdep \$(DPFLAGS) --
 MV = $mv
 RM = $rm -f
 SCRIPTDIR = $installscript
@@ -57,22 +58,15 @@ SCRIPTS =  \$(SCRIPT)
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $
-
-########################################################################
-# Force 'make depend' to be performed first -- do not edit
-
-.FORCE_DEPEND::
-
-all:: .FORCE_DEPEND
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.2 1994/04/22 09:35:35 ram Exp ram $
+# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -110,46 +104,58 @@ kitpost: kitpost.SH
 	/bin/sh kitpost.SH
 
 
-install:: $(SCRIPTS) $(LSCRIPTS)
-	@for file in $(SCRIPTS) $(LSCRIPTS); do \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		(set -x; $(INSTALL) -c -m 555 $$file $(SCRIPTDIR)); \
+local_install:: $(SCRIPTS) $(LSCRIPTS)
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+	for file in $(SCRIPTS) $(LSCRIPTS); do \
+		(set -x; \
+		$(INSTALL) -c -m 555 $$file $(INSTALL_PREFIX)$(SCRIPTDIR)) || \
+		exit 1; \
 	done
 
-deinstall::
+local_deinstall::
 	@for file in $(SCRIPTS) $(LSCRIPTS); do \
 		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		(set -x; $(RM) $(SCRIPTDIR)/$$file); \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/$$file); \
 	done
 
-install.man::
-	@if test "$(MANSRC)"; then \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		for file in $(SCRIPTS); do \
+local_install.man::
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \
+	for file in $(SCRIPTS); do \
+		if test -f $$file.man; then \
 			(set -x; \
-			$(INSTALL) -c -m 444 $$file.man $(MANSRC)/$$file.$(L)); \
-		done; \
-	else exit 0; fi
+			$(INSTALL) -c -m 444 $$file.man \
+				$(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)) || \
+				exit 1; \
+		fi; \
+	done
 
-deinstall.man::
-	@if test "$(MANSRC)"; then \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		for file in $(SCRIPTS); do \
-			(set -x; $(RM) $(MANSRC)/$$file.$(L)); \
-		done; \
-	else exit 0; fi
+local_deinstall.man::
+	case '${MFLAGS}' in *[i]*) set +e;; esac; \
+	for file in $(SCRIPTS); do \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(MANSRC)/$$file.$(L)); \
+	done
 
-install:: makeSH
-	$(INSTALL) -c -m 555  makeSH $(SCRIPTDIR)
+local_install:: makeSH
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+	$(INSTALL) -c -m 555  makeSH $(INSTALL_PREFIX)$(SCRIPTDIR)
 
-deinstall::
-	$(RM) $(SCRIPTDIR)/makeSH
+local_deinstall::
+	$(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/makeSH
 
-install.man:: makeSH.man
-	$(INSTALL) -c -m 444 makeSH.man $(MANSRC)/makeSH.$(L)
+local_install.man:: makeSH.man
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \
+	$(INSTALL) -c -m 444 makeSH.man $(INSTALL_PREFIX)$(MANSRC)/makeSH.$(L)
 
-deinstall.man::
-	$(RM) $(MANSRC)/makeSH.$(L)
+local_deinstall.man::
+	$(RM) $(INSTALL_PREFIX)$(MANSRC)/makeSH.$(L)
 
 SCRIPTSH = \
 	makedist.SH \
@@ -169,20 +175,42 @@ depend::
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: local_clean
 realclean: local_realclean
 clobber: local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install
+install.man:: maybe_install.man
+deinstall:: local_deinstall
+deinstall.man:: maybe_deinstall.man
+
+install.man-yes: local_install.man
+install.man-no:
+deinstall.man-yes: local_deinstall.man
+deinstall.man-no:
+
+!NO!SUBS!
+case "$installmansrc" in
+'') man=no;;
+*) man=yes;;
+esac
+$spitshell >>Makefile <<!GROK!THIS!
+maybe_install.man: install.man-$man
+maybe_deinstall.man: deinstall.man-$man
+!GROK!THIS!
+$spitshell >>Makefile <<'!NO!SUBS!'
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
 		if test -f Makefile.SH; then \
@@ -191,7 +219,7 @@ Makefile.SH: Jmakefile
 		fi; \
 		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
 		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -206,29 +234,22 @@ local_clobber::
 ########################################################################
 # Empty rules for directories with no sub-directories -- do not edit
 
-install::
+local_install::
 	@echo "install in $(CURRENT) done."
 
-deinstall::
+local_deinstall::
 	@echo "deinstall in $(CURRENT) done."
 
-install.man::
+local_install.man::
 	@echo "install.man in $(CURRENT) done."
 
-deinstall.man::
+local_deinstall.man::
 	@echo "deinstall.man in $(CURRENT) done."
 
 Makefiles::
 
 Makefiles.SH::
 
-########################################################################
-# Dependencies generated by make depend
-# DO NOT DELETE THIS LINE -- make depend relies on it
-
-# Put nothing here or make depend will gobble it up
-.FORCE_DEPEND::
-	@echo "You must run 'make depend' in $(TOP) first."; exit 1
 !NO!SUBS!
 chmod 644 Makefile
 $eunicefix Makefile
diff --git a/lib/C/Makefile.SH b/lib/C/Makefile.SH
index 764aa48..f72cdfc 100755
--- a/lib/C/Makefile.SH
+++ b/lib/C/Makefile.SH
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44]
-: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
 
 case $CONFIG in
 '')
@@ -37,7 +37,7 @@ DIR = $DIR
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
-MAKE = make
+JCPPFLAGS = $cppflags
 MV = $mv
 RM = $rm -f
 
@@ -50,15 +50,15 @@ SUBDIRS = fake
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:38 ram Exp ram $
+# $X-Id: Jmakefile 3 2006-08-25 21:39:07Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -73,20 +73,32 @@ $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: sub_clean local_clean
 realclean: sub_realclean local_realclean
 clobber: sub_clobber local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install sub_install
+install.man:: maybe_install.man sub_install.man
+deinstall:: sub_deinstall local_deinstall
+deinstall.man:: sub_deinstall.man maybe_deinstall.man
+
+install.man-no:
+deinstall.man-no:
+
+maybe_install.man: install.man-no
+maybe_deinstall.man: deinstall.man-no
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
 		if test -f Makefile.SH; then \
@@ -95,7 +107,7 @@ Makefile.SH: Jmakefile
 		fi; \
 		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
 		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -115,20 +127,22 @@ subdirs:
 	for i in $(SUBDIRS) ;\
 	do \
 		(cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
-			$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \
+			$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \
 	done
 
-install::
+sub_install::
 	@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
 
-deinstall::
+sub_deinstall::
 	@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall...
 
-install.man::
+sub_install.man::
 	@$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS=
 
-deinstall.man::
+sub_deinstall.man::
 	@$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall.man...
 
 sub_clean::
 	@$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS=
@@ -147,7 +161,7 @@ tag::
 	for i in $(SUBDIRS) ;\
 	do \
 		(cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
-			$(MAKE) $(MFLAGS)  tag); \
+			$(MAKE) $(MFLAGS)  tag) || exit 1; \
 	done
 
 Makefiles::
@@ -157,7 +171,7 @@ Makefiles::
 		echo "Making "Makefiles" in $(DIR)$$i..."; \
 		(cd $$i || exit 1; \
 		if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
-		$(MAKE) $(MFLAGS) Makefiles) \
+		$(MAKE) $(MFLAGS) Makefiles) || exit 1;\
 	done
 
 Makefiles.SH:: Makefile.SH
@@ -174,14 +188,23 @@ Makefiles.SH:: Makefile.SH
 		/*) newtop="$(TOP)" ;; \
 		esac; \
 		echo "Making Makefiles.SH in $(DIR)$$i..."; \
-		(cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \
-		Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\
-		$(MAKE) $(MFLAGS) Makefiles.SH) \
+		(cd $$i || exit 1; \
+			if test -f Jmakefile; then \
+				$(MAKE) $(MFLAGS) -f ../Makefile \
+					Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \
+				$(MAKE) $(MFLAGS) Makefiles.SH; \
+			fi; \
+		) || exit 1; \
 	done
 
 all::
 	@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
 
+local_install::
+local_deinstall::
+local_install.man::
+local_deinstall.man::
+
 !NO!SUBS!
 chmod 644 Makefile
 $eunicefix Makefile
diff --git a/lib/C/fake/Makefile.SH b/lib/C/fake/Makefile.SH
index 6030d62..ad637ae 100755
--- a/lib/C/fake/Makefile.SH
+++ b/lib/C/fake/Makefile.SH
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44]
-: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
 
 case $CONFIG in
 '')
@@ -41,7 +41,7 @@ INSTALLDIR = $INSTALLDIR
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
-MAKE = make
+JCPPFLAGS = $cppflags
 MV = $mv
 PRIVLIB = $installprivlib
 RM = $rm -f
@@ -50,15 +50,15 @@ RM = $rm -f
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:44 ram Exp ram $
+# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -77,40 +77,56 @@ INSTALLFLAGS = -m 444
 all::
 
 install::
-	@for dir in $(PRIVLIB)/lib/C/fake; do \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
+	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+	for dir in $(PRIVLIB)/lib/C/fake; do \
+		(set -x; test -d $$dir || $(INSTALLDIR) $$dir) || \
+		exit 1; \
 	done
 
-install:: $(FILES)
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+local_install:: $(FILES)
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake); \
 	for i in $(FILES); do \
-		(set -x; $(INSTALL) -c $(INSTALLFLAGS) $$i $(PRIVLIB)/lib/C/fake); \
+		(set -x; $(INSTALL) -c $(INSTALLFLAGS) \
+			$$i $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake) || exit 1;\
 	done
 
-deinstall::
+local_deinstall::
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
 	for i in $(FILES); do \
-		(set -x; $(RM) $(PRIVLIB)/lib/C/fake/$$i); \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/lib/C/fake/$$i); \
 	done
 
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: local_clean
 realclean: local_realclean
 clobber: local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install
+install.man:: maybe_install.man
+deinstall:: local_deinstall
+deinstall.man:: maybe_deinstall.man
+
+install.man-no:
+deinstall.man-no:
+
+maybe_install.man: install.man-no
+maybe_deinstall.man: deinstall.man-no
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
 		if test -f Makefile.SH; then \
@@ -119,7 +135,7 @@ Makefile.SH: Jmakefile
 		fi; \
 		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
 		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -134,16 +150,16 @@ local_clobber::
 ########################################################################
 # Empty rules for directories with no sub-directories -- do not edit
 
-install::
+local_install::
 	@echo "install in $(CURRENT) done."
 
-deinstall::
+local_deinstall::
 	@echo "deinstall in $(CURRENT) done."
 
-install.man::
+local_install.man::
 	@echo "install.man in $(CURRENT) done."
 
-deinstall.man::
+local_deinstall.man::
 	@echo "deinstall.man in $(CURRENT) done."
 
 Makefiles::
diff --git a/lib/Makefile.SH b/lib/Makefile.SH
index 02e4528..9988b2f 100755
--- a/lib/Makefile.SH
+++ b/lib/Makefile.SH
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44]
-: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
 
 case $CONFIG in
 '')
@@ -41,7 +41,7 @@ INSTALLDIR = $INSTALLDIR
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
-MAKE = make
+JCPPFLAGS = $cppflags
 MV = $mv
 PRIVLIB = $installprivlib
 RM = $rm -f
@@ -55,15 +55,15 @@ SUBDIRS = C
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.1 1994/01/24 13:43:31 ram Exp ram $
+# $X-Id: Jmakefile 5 2006-08-25 22:09:39Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -86,21 +86,25 @@ INSTALLFLAGS = -m 444
 all::
 
 install::
-	@for dir in $(PRIVLIB)/lib; do \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
+	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+	for dir in $(PRIVLIB)/lib; do \
+		(set -x; test -d $$dir || $(INSTALLDIR) $$dir) || \
+		exit 1; \
 	done
 
-install:: $(FILES)
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+local_install:: $(FILES)
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/lib || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/lib); \
 	for i in $(FILES); do \
-		(set -x; $(INSTALL) -c $(INSTALLFLAGS) $$i $(PRIVLIB)/lib); \
+		(set -x; $(INSTALL) -c $(INSTALLFLAGS) \
+			$$i $(INSTALL_PREFIX)$(PRIVLIB)/lib) || exit 1;\
 	done
 
-deinstall::
+local_deinstall::
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
 	for i in $(FILES); do \
-		(set -x; $(RM) $(PRIVLIB)/lib/$$i); \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/lib/$$i); \
 	done
 
 
@@ -131,20 +135,32 @@ deinstall::
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: sub_clean local_clean
 realclean: sub_realclean local_realclean
 clobber: sub_clobber local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install sub_install
+install.man:: maybe_install.man sub_install.man
+deinstall:: sub_deinstall local_deinstall
+deinstall.man:: sub_deinstall.man maybe_deinstall.man
+
+install.man-no:
+deinstall.man-no:
+
+maybe_install.man: install.man-no
+maybe_deinstall.man: deinstall.man-no
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
 		if test -f Makefile.SH; then \
@@ -153,7 +169,7 @@ Makefile.SH: Jmakefile
 		fi; \
 		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
 		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -173,20 +189,22 @@ subdirs:
 	for i in $(SUBDIRS) ;\
 	do \
 		(cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
-			$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \
+			$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \
 	done
 
-install::
+sub_install::
 	@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
 
-deinstall::
+sub_deinstall::
 	@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall...
 
-install.man::
+sub_install.man::
 	@$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS=
 
-deinstall.man::
+sub_deinstall.man::
 	@$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall.man...
 
 sub_clean::
 	@$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS=
@@ -205,7 +223,7 @@ tag::
 	for i in $(SUBDIRS) ;\
 	do \
 		(cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
-			$(MAKE) $(MFLAGS)  tag); \
+			$(MAKE) $(MFLAGS)  tag) || exit 1; \
 	done
 
 Makefiles::
@@ -215,7 +233,7 @@ Makefiles::
 		echo "Making "Makefiles" in $(DIR)$$i..."; \
 		(cd $$i || exit 1; \
 		if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
-		$(MAKE) $(MFLAGS) Makefiles) \
+		$(MAKE) $(MFLAGS) Makefiles) || exit 1;\
 	done
 
 Makefiles.SH:: Makefile.SH
@@ -232,14 +250,23 @@ Makefiles.SH:: Makefile.SH
 		/*) newtop="$(TOP)" ;; \
 		esac; \
 		echo "Making Makefiles.SH in $(DIR)$$i..."; \
-		(cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \
-		Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\
-		$(MAKE) $(MFLAGS) Makefiles.SH) \
+		(cd $$i || exit 1; \
+			if test -f Jmakefile; then \
+				$(MAKE) $(MFLAGS) -f ../Makefile \
+					Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \
+				$(MAKE) $(MFLAGS) Makefiles.SH; \
+			fi; \
+		) || exit 1; \
 	done
 
 all::
 	@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
 
+local_install::
+local_deinstall::
+local_install.man::
+local_deinstall.man::
+
 !NO!SUBS!
 chmod 644 Makefile
 $eunicefix Makefile
diff --git a/mcon/Makefile.SH b/mcon/Makefile.SH
index cf4798e..c27f901 100755
--- a/mcon/Makefile.SH
+++ b/mcon/Makefile.SH
@@ -1,5 +1,6 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL55]
-: $X-Id: Jmake.tmpl,v 3.0.1.2 1995/01/11 14:50:21 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
+
 case $CONFIG in
 '')
 	if test -f config.sh; then TOP=.;
@@ -40,8 +41,7 @@ INSTALLDIR = $INSTALLDIR
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
-MAKE = make
-MKDEP = $mkdep \$(DPFLAGS) --
+JCPPFLAGS = $cppflags
 MV = $mv
 PRIVLIB = $installprivlib
 RM = $rm -f
@@ -58,21 +58,15 @@ BIN =  metaconfig metalint metaxref
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.3 1995/03/21 08:35:28 ram Exp ram $
-########################################################################
-# Force 'make depend' to be performed first -- do not edit
-
-.FORCE_DEPEND::
-
-all:: .FORCE_DEPEND
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.4 1995/07/25 13:23:09 ram Exp ram $
+# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -114,55 +108,74 @@ makegloss: makegloss.SH
 	/bin/sh makegloss.SH
 
 
-install::
-	@for dir in $(PRIVLIB) $(PRIVLIB)/U; do \
-	case '${MFLAGS}' in *[i]*) set +e;; esac; \
-	(set -x; test -d $$dir || $(INSTALLDIR) $$dir); \
+local_install::
+	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+	for dir in $(PRIVLIB) $(PRIVLIB)/U; do	\
+		(set -x; test -d $(INSTALL_PREFIX)$$dir || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$$dir);	\
 	done
 
-deinstall::
-	$(RM) -r $(PRIVLIB) $(PRIVLIB)/U
-
-install:: Glossary
-	$(INSTALL) -c -m 444 Glossary $(PRIVLIB)
-
-deinstall::
-	$(RM) $(PRIVLIB)/Glossary
-
-install:: makegloss
-	$(INSTALL) -c -m 555  makegloss $(PRIVLIB)
-
-deinstall::
-	$(RM) $(PRIVLIB)/makegloss
-
-install:: configure
-	$(INSTALL) -c -m 555  configure $(PRIVLIB)
-
-deinstall::
-	$(RM) $(PRIVLIB)/configure
-
-install:: U/[a-d]*.U
+local_deinstall::
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+	for dir in $(PRIVLIB) $(PRIVLIB)/U; do \
+		(set -x; test -d $$dir && $(RM) -r $(INSTALL_PREFIX)$$dir); \
+	done
+
+local_install:: Glossary
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \
+	$(INSTALL) -c -m 444 Glossary $(INSTALL_PREFIX)$(PRIVLIB)
+
+local_deinstall::
+	$(RM) $(INSTALL_PREFIX)$(PRIVLIB)/Glossary
+
+local_install:: makegloss
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \
+	$(INSTALL) -c -m 555  makegloss $(INSTALL_PREFIX)$(PRIVLIB)
+
+local_deinstall::
+	$(RM) $(INSTALL_PREFIX)$(PRIVLIB)/makegloss
+
+local_install:: configure
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)); \
+	$(INSTALL) -c -m 555  configure $(INSTALL_PREFIX)$(PRIVLIB)
+
+local_deinstall::
+	$(RM) $(INSTALL_PREFIX)$(PRIVLIB)/configure
+
+local_install:: U/[a-d]*.U
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/U || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/U); \
 	for i in U/[a-d]*.U; do \
-	(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/U); \
+		(set -x; $(INSTALL) -c -m 444 \
+			$$i $(INSTALL_PREFIX)$(PRIVLIB)/U) || exit 1;\
 	done
 
-deinstall::
+local_deinstall::
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
 	for i in U/[a-d]*.U; do \
-	(set -x; $(RM) $(PRIVLIB)/U/$$i); \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/U/$$i); \
 	done
 
-install:: U/[A-Ze-z]*.U
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+local_install:: U/[A-Ze-z]*.U
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(PRIVLIB)/U || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(PRIVLIB)/U); \
 	for i in U/[A-Ze-z]*.U; do \
-	(set -x; $(INSTALL) -c -m 444 $$i $(PRIVLIB)/U); \
+		(set -x; $(INSTALL) -c -m 444 \
+			$$i $(INSTALL_PREFIX)$(PRIVLIB)/U) || exit 1;\
 	done
 
-deinstall::
+local_deinstall::
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
 	for i in U/[A-Ze-z]*.U; do \
-	(set -x; $(RM) $(PRIVLIB)/U/$$i); \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(PRIVLIB)/U/$$i); \
 	done
 
 all:: metaconfig mconfig
@@ -182,11 +195,14 @@ metaconfig: mconfig
 	perl $(TOP)/bin/perload -o mconfig > $@
 	chmod +rx $@
 
-install:: metaconfig
-	$(INSTALL) -c -m 555  metaconfig $(SCRIPTDIR)
+local_install:: metaconfig
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+	$(INSTALL) -c -m 555  metaconfig $(INSTALL_PREFIX)$(SCRIPTDIR)
 
-deinstall::
-	$(RM) $(SCRIPTDIR)/metaconfig
+local_deinstall::
+	$(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/metaconfig
 
 all:: metalint mlint
 
@@ -205,11 +221,14 @@ metalint: mlint
 	perl $(TOP)/bin/perload -o mlint > $@
 	chmod +rx $@
 
-install:: metalint
-	$(INSTALL) -c -m 555  metalint $(SCRIPTDIR)
+local_install:: metalint
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+	$(INSTALL) -c -m 555  metalint $(INSTALL_PREFIX)$(SCRIPTDIR)
 
-deinstall::
-	$(RM) $(SCRIPTDIR)/metalint
+local_deinstall::
+	$(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/metalint
 
 all:: metaxref mxref
 
@@ -228,11 +247,14 @@ metaxref: mxref
 	perl $(TOP)/bin/perload -o mxref > $@
 	chmod +rx $@
 
-install:: metaxref
-	$(INSTALL) -c -m 555  metaxref $(SCRIPTDIR)
+local_install:: metaxref
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
+	$(INSTALL) -c -m 555  metaxref $(INSTALL_PREFIX)$(SCRIPTDIR)
 
-deinstall::
-	$(RM) $(SCRIPTDIR)/metaxref
+local_deinstall::
+	$(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/metaxref
 
 BINFILES = \
 	mconfig \
@@ -256,29 +278,41 @@ depend::
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: sub_clean local_clean
 realclean: sub_realclean local_realclean
 clobber: sub_clobber local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install sub_install
+install.man:: maybe_install.man sub_install.man
+deinstall:: sub_deinstall local_deinstall
+deinstall.man:: sub_deinstall.man maybe_deinstall.man
+
+install.man-no:
+deinstall.man-no:
+
+maybe_install.man: install.man-no
+maybe_deinstall.man: deinstall.man-no
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
-	if test -f Makefile.SH; then \
-	echo "	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
-	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
-	fi; \
-	echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
-	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+		if test -f Makefile.SH; then \
+			echo "	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
+			$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
+		fi; \
+		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
+		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -297,21 +331,23 @@ subdirs:
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS) ;\
 	do \
-	(cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
-	$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)); \
+		(cd $$i ; echo $(VERB) "in $(DIR)$$i..."; \
+			$(MAKE) $(MFLAGS) $(FLAGS) $(TARGET)) || exit 1; \
 	done
 
-install::
+sub_install::
 	@$(MAKE) subdirs TARGET=install VERB="Installing" FLAGS=
 
-deinstall::
+sub_deinstall::
 	@$(MAKE) subdirs TARGET=deinstall VERB="Deinstalling" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall...
 
-install.man::
+sub_install.man::
 	@$(MAKE) subdirs TARGET=install.man VERB="Installing man pages" FLAGS=
 
-deinstall.man::
+sub_deinstall.man::
 	@$(MAKE) subdirs TARGET=deinstall.man VERB="Deinstalling man pages" FLAGS=
+	@echo "Back to $(CURRENT) for "deinstall.man...
 
 sub_clean::
 	@$(MAKE) subdirs TARGET=clean VERB="Cleaning" FLAGS=
@@ -329,49 +365,51 @@ tag::
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS) ;\
 	do \
-	(cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
-	$(MAKE) $(MFLAGS)  tag); \
+		(cd $$i ; echo "Tagging" "in $(DIR)$$i..."; \
+			$(MAKE) $(MFLAGS)  tag) || exit 1; \
 	done
 
 Makefiles::
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS);\
 	do \
-	echo "Making "Makefiles" in $(DIR)$$i..."; \
-	(cd $$i || exit 1; \
-	if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
-	$(MAKE) $(MFLAGS) Makefiles) \
+		echo "Making "Makefiles" in $(DIR)$$i..."; \
+		(cd $$i || exit 1; \
+		if test ! -f Makefile; then /bin/sh Makefile.SH; fi; \
+		$(MAKE) $(MFLAGS) Makefiles) || exit 1;\
 	done
 
 Makefiles.SH:: Makefile.SH
 	@case '${MFLAGS}' in *[ik]*) set +e;; esac; \
 	for i in $(SUBDIRS);\
 	do \
-	case "$(DIR)$$i/" in \
-	*/*/*/*/) newtop=../../../..;; \
-	*/*/*/) newtop=../../..;; \
-	*/*/) newtop=../..;; \
-	*/) newtop=..;; \
-	esac; \
-	case "$(TOP)" in \
-	/*) newtop="$(TOP)" ;; \
-	esac; \
-	echo "Making Makefiles.SH in $(DIR)$$i..."; \
-	(cd $$i || exit 1; $(MAKE) $(MFLAGS) -f ../Makefile \
-	Makefile TOP=$$newtop CURRENT=$(DIR)$$i;\
-	$(MAKE) $(MFLAGS) Makefiles.SH) \
+		case "$(DIR)$$i/" in \
+		*/*/*/*/) newtop=../../../..;; \
+		*/*/*/) newtop=../../..;; \
+		*/*/) newtop=../..;; \
+		*/) newtop=..;; \
+		esac; \
+		case "$(TOP)" in \
+		/*) newtop="$(TOP)" ;; \
+		esac; \
+		echo "Making Makefiles.SH in $(DIR)$$i..."; \
+		(cd $$i || exit 1; \
+			if test -f Jmakefile; then \
+				$(MAKE) $(MFLAGS) -f ../Makefile \
+					Makefile TOP=$$newtop CURRENT=$(DIR)$$i && \
+				$(MAKE) $(MFLAGS) Makefiles.SH; \
+			fi; \
+		) || exit 1; \
 	done
 
 all::
 	@$(MAKE) subdirs TARGET=all VERB="Making all" FLAGS=
 
-########################################################################
-# Dependencies generated by make depend
-# DO NOT DELETE THIS LINE -- make depend relies on it
+local_install::
+local_deinstall::
+local_install.man::
+local_deinstall.man::
 
-# Put nothing here or make depend will gobble it up
-.FORCE_DEPEND::
-	@echo "You must run 'make depend' in $(TOP) first."; exit 1
 !NO!SUBS!
 chmod 644 Makefile
 $eunicefix Makefile
diff --git a/mcon/man/Makefile.SH b/mcon/man/Makefile.SH
index f146784..94e186c 100755
--- a/mcon/man/Makefile.SH
+++ b/mcon/man/Makefile.SH
@@ -1,5 +1,5 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL44]
-: $X-Id: Jmake.tmpl,v 3.0.1.1 1993/08/20 07:36:36 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
 
 case $CONFIG in
 '')
@@ -22,6 +22,7 @@ DIR=`echo $CURRENT/ | sed -e 's/\.\///g'`
 echo "Extracting ${DIR}Makefile (with variable substitutions)"
 
 INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'`
+INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'`
 DATE=`date`
 
 $spitshell >Makefile <<!GROK!THIS!
@@ -34,14 +35,15 @@ TOP = ../..
 CURRENT = $CURRENT
 DIR = $DIR
 INSTALL = $INSTALL
+INSTALLDIR = $INSTALLDIR
 
 ########################################################################
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
+JCPPFLAGS = $cppflags
 L = $manext
 MANSRC = $installmansrc
-MAKE = make
 MV = $mv
 RM = $rm -f
 
@@ -62,15 +64,15 @@ MANPAGE =  \$(MPAGES)
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.1 1994/10/29 15:46:30 ram Exp ram $
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0 1993/08/18 12:10:13 ram Exp ram $
+# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -89,39 +91,60 @@ all:: $(MPAGES)
 local_realclean::
 	$(RM) $(MPAGES)
 
-install.man::
-	@if test "$(MANSRC)"; then \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		for file in $(MPAGES); do \
-			(set -x; $(INSTALL) -c -m 444 $$file $(MANSRC)); \
-		done; \
-	else exit 0; fi
-
-deinstall.man::
-	@if test "$(MANSRC)"; then \
-		case '${MFLAGS}' in *[i]*) set +e;; esac; \
-		for file in $(MPAGES); do \
-			(set -x; $(RM) $(MANSRC)/$$file); \
-		done; \
-	else exit 0; fi
+local_install.man::
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \
+	for file in $(MPAGES); do \
+		(set -x; $(INSTALL) -c -m 444 $$file \
+			$(INSTALL_PREFIX)$(MANSRC)) || exit 1; \
+	done
+
+local_deinstall.man::
+	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+	for file in $(MPAGES); do \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(MANSRC)/$$file); \
+	done
 
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: local_clean
 realclean: local_realclean
 clobber: local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install
+install.man:: maybe_install.man
+deinstall:: local_deinstall
+deinstall.man:: maybe_deinstall.man
+
+install.man-yes: local_install.man
+install.man-no:
+deinstall.man-yes: local_deinstall.man
+deinstall.man-no:
+
+!NO!SUBS!
+case "$installmansrc" in
+'') man=no;;
+*) man=yes;;
+esac
+$spitshell >>Makefile <<!GROK!THIS!
+maybe_install.man: install.man-$man
+maybe_deinstall.man: deinstall.man-$man
+!GROK!THIS!
+$spitshell >>Makefile <<'!NO!SUBS!'
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
 		if test -f Makefile.SH; then \
@@ -130,7 +153,7 @@ Makefile.SH: Jmakefile
 		fi; \
 		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
 		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -145,16 +168,16 @@ local_clobber::
 ########################################################################
 # Empty rules for directories with no sub-directories -- do not edit
 
-install::
+local_install::
 	@echo "install in $(CURRENT) done."
 
-deinstall::
+local_deinstall::
 	@echo "deinstall in $(CURRENT) done."
 
-install.man::
+local_install.man::
 	@echo "install.man in $(CURRENT) done."
 
-deinstall.man::
+local_deinstall.man::
 	@echo "deinstall.man in $(CURRENT) done."
 
 Makefiles::
diff --git a/pat/Makefile.SH b/pat/Makefile.SH
index 8424f98..d6a7a10 100755
--- a/pat/Makefile.SH
+++ b/pat/Makefile.SH
@@ -1,5 +1,6 @@
-: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.0 PL55]
-: $X-Id: Jmake.tmpl,v 3.0.1.2 1995/01/11 14:50:21 ram Exp ram $
+: Makefile.SH generated from Jmake.tmpl and Jmakefile [jmake 3.5 PL0]
+: $X-Id: Jmake.tmpl 8 2006-08-25 22:27:18Z rmanfredi $
+
 case $CONFIG in
 '')
 	if test -f config.sh; then TOP=.;
@@ -21,6 +22,7 @@ DIR=`echo $CURRENT/ | sed -e 's/\.\///g'`
 echo "Extracting ${DIR}Makefile (with variable substitutions)"
 
 INSTALL=`echo $install | sed -e 's,\./i,\$(TOP)/i,'`
+INSTALLDIR=`echo $installdir | sed -e 's,\./i,\$(TOP)/i,'`
 DATE=`date`
 
 $spitshell >Makefile <<!GROK!THIS!
@@ -33,15 +35,15 @@ TOP = ..
 CURRENT = $CURRENT
 DIR = $DIR
 INSTALL = $INSTALL
+INSTALLDIR = $INSTALLDIR
 
 ########################################################################
 # Parameters set by Configure -- edit config.sh if changes are needed
 
 CTAGS = ctags
+JCPPFLAGS = $cppflags
 L = $manext
 MANSRC = $installmansrc
-MAKE = make
-MKDEP = $mkdep \$(DPFLAGS) --
 MV = $mv
 RM = $rm -f
 SCRIPTDIR = $installscript
@@ -51,21 +53,15 @@ SED = $sed
 $spitshell >>Makefile <<'!NO!SUBS!'
 ########################################################################
 # Jmake rules for building libraries, programs, scripts, and data files
-# $X-Id: Jmake.rules,v 3.0.1.3 1995/03/21 08:35:28 ram Exp ram $
-########################################################################
-# Force 'make depend' to be performed first -- do not edit
-
-.FORCE_DEPEND::
-
-all:: .FORCE_DEPEND
+# $X-Id: Jmake.rules 8 2006-08-25 22:27:18Z rmanfredi $
 
 ########################################################################
 # Start of Jmakefile
 
-# $X-Id: Jmakefile,v 3.0.1.3 1995/07/24 09:57:21 ram Exp ram $
+# $X-Id: Jmakefile 9 2006-08-25 22:31:50Z rmanfredi $
 #
 #  Copyright (c) 1991-1997, 2004-2006, Raphael Manfredi
-#  
+#
 #  You may redistribute only under the terms of the Artistic Licence,
 #  as specified in the README file that comes with the distribution.
 #  You may reuse parts of this distribution only within the terms of
@@ -157,23 +153,29 @@ patlog: patlog.SH
 	/bin/sh patlog.SH
 
 
-install:: $(PAT)
-	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
+local_install:: $(PAT)
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(SCRIPTDIR) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(SCRIPTDIR)); \
 	for i in $(PAT); do \
-	(set -x; $(INSTALL) -c -m 555 $$i $(SCRIPTDIR)); \
+		(set -x; $(INSTALL) -c -m 555 \
+			$$i $(INSTALL_PREFIX)$(SCRIPTDIR)) || exit 1;\
 	done
 
-deinstall::
+local_deinstall::
 	@case '${MFLAGS}' in *[i]*) set +e;; esac; \
 	for i in $(PAT); do \
-	(set -x; $(RM) $(SCRIPTDIR)/$$i); \
+		(set -x; $(RM) $(INSTALL_PREFIX)$(SCRIPTDIR)/$$i); \
 	done
 
-install.man:: pat.man
-	$(INSTALL) -c -m 444 pat.man $(MANSRC)/pat.$(L)
+local_install.man:: pat.man
+	@case '${MFLAGS}' in *[i]*) set +e;; esac;		\
+	(set -x; test -d $(INSTALL_PREFIX)$(MANSRC) || \
+		$(INSTALLDIR) $(INSTALL_PREFIX)$(MANSRC)); \
+	$(INSTALL) -c -m 444 pat.man $(INSTALL_PREFIX)$(MANSRC)/pat.$(L)
 
-deinstall.man::
-	$(RM) $(MANSRC)/pat.$(L)
+local_deinstall.man::
+	$(RM) $(INSTALL_PREFIX)$(MANSRC)/pat.$(L)
 
 PATSH = \
 	pat.SH \
@@ -204,29 +206,51 @@ depend::
 ########################################################################
 # Common rules for all Makefiles -- do not edit
 
-emptyrule::
+all::
 
 clean: local_clean
 realclean: local_realclean
 clobber: local_clobber
 
 local_clean::
-	$(RM) core *~ *.o
+	if test -f core; then $(RM) core; fi
+	$(RM) *~ *.o
 
 local_realclean:: local_clean
 
 local_clobber:: local_realclean
 	$(RM) Makefile config.sh
 
+install:: local_install
+install.man:: maybe_install.man
+deinstall:: local_deinstall
+deinstall.man:: maybe_deinstall.man
+
+install.man-yes: local_install.man
+install.man-no:
+deinstall.man-yes: local_deinstall.man
+deinstall.man-no:
+
+!NO!SUBS!
+case "$installmansrc" in
+'') man=no;;
+*) man=yes;;
+esac
+$spitshell >>Makefile <<!GROK!THIS!
+maybe_install.man: install.man-$man
+maybe_deinstall.man: deinstall.man-$man
+!GROK!THIS!
+$spitshell >>Makefile <<'!NO!SUBS!'
+
 Makefile.SH: Jmakefile
 	-@if test -f $(TOP)/.package; then \
-	if test -f Makefile.SH; then \
-	echo "	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
-	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
-	fi; \
-	echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
-	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
-	else touch $@; exit 0; fi
+		if test -f Makefile.SH; then \
+			echo "	$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~"; \
+			$(RM) Makefile.SH~; $(MV) Makefile.SH Makefile.SH~; \
+		fi; \
+		echo "	$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT)" ; \
+		$(JMAKE) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT) ; \
+	else touch $@; fi
 
 Makefile: Makefile.SH
 	/bin/sh Makefile.SH
@@ -241,28 +265,22 @@ local_clobber::
 ########################################################################
 # Empty rules for directories with no sub-directories -- do not edit
 
-install::
+local_install::
 	@echo "install in $(CURRENT) done."
 
-deinstall::
+local_deinstall::
 	@echo "deinstall in $(CURRENT) done."
 
-install.man::
+local_install.man::
 	@echo "install.man in $(CURRENT) done."
 
-deinstall.man::
+local_deinstall.man::
 	@echo "deinstall.man in $(CURRENT) done."
+
 Makefiles::
 
 Makefiles.SH::
 
-########################################################################
-# Dependencies generated by make depend
-# DO NOT DELETE THIS LINE -- make depend relies on it
-
-# Put nothing here or make depend will gobble it up
-.FORCE_DEPEND::
-	@echo "You must run 'make depend' in $(TOP) first."; exit 1
 !NO!SUBS!
 chmod 644 Makefile
 $eunicefix Makefile