Index: Makefile.in
===================================================================
diff -u -r5c18ff311048e7f30240c4d74910c2e1387e16e9 -rdc304563f2bba1ad65732cd5114f91f5a3770e30
--- Makefile.in	(.../Makefile.in)	(revision 5c18ff311048e7f30240c4d74910c2e1387e16e9)
+++ Makefile.in	(.../Makefile.in)	(revision dc304563f2bba1ad65732cd5114f91f5a3770e30)
@@ -174,7 +174,7 @@
 
 xotcl_pkglibdir	= @pkglibdir@/xotcl
 
-# NXSH = @NXSH@
+installed_shells = $(DESTDIR)$(bindir)/nxsh $(DESTDIR)$(bindir)/nxwish $(DESTDIR)$(bindir)/xotclsh $(DESTDIR)$(bindir)/xowish
 
 #========================================================================
 # TCLLIBPATH seeds the auto_path in Tcl's init.tcl so we can test our
@@ -365,16 +365,14 @@
 #========================================================================
 
 install-doc: doc $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man3 $(DESTDIR)$(mandir)/mann
-	@if test ! "x$(NXSH)" = "x" ; then \
 	(cd $(src_man_dir)/ ; \
 	 for i in *.1; do \
 	    echo "Installing $$i"; \
 	    rm -f $(DESTDIR)$(mandir)/man1/$$i; \
 	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
 		    $$i > $(DESTDIR)$(mandir)/man1/$$i; \
 	    chmod 444 $(DESTDIR)$(mandir)/man1/$$i; \
-	    done) ; \
-	fi
+	    done)
 
 shell: binaries libraries
 	@$(TCLSH) $(SCRIPT)
@@ -559,7 +557,7 @@
 #========================================================================
 
 clean:  
-	-rm -rf $(BINARIES) $(CLEANFILES) @NXSH@ @XOWISH@ pkgIndex.tcl ./receiver \
+	-rm -rf $(BINARIES) $(CLEANFILES) $(installed_shells) pkgIndex.tcl ./receiver \
 		$(xotcl_target_doc_dir)/*-xotcl.html
 	find ${srcdir} -type f -name \*~ -exec rm \{} \;
 	@if test ! "x$(subdirs)" = "x" ; then dirs="$(subdirs)" ; \
@@ -710,7 +708,9 @@
 
 bin-tar: 
 	(cd ..; tar zcvf xotcl-$(PACKAGE_VERSION)-bin-linux-i686-glibc.tar.gz \
-                `find $(exec_prefix)/bin/$(NXSH) $(exec_prefix)/bin/xowish \
+                `find \
+                  $(prefix)/bin/nx*sh \
+                  $(prefix)/bin/xotcl*sh \
                   $(prefix)/lib/nsf* \
                   $(prefix)/lib/libnsf* \
 		  $(prefix)/include/nsf*.h \
Index: TODO
===================================================================
diff -u -r6b67a152a9c351a6669aec517b4e982adeafb641 -rdc304563f2bba1ad65732cd5114f91f5a3770e30
--- TODO	(.../TODO)	(revision 6b67a152a9c351a6669aec517b4e982adeafb641)
+++ TODO	(.../TODO)	(revision dc304563f2bba1ad65732cd5114f91f5a3770e30)
@@ -1548,11 +1548,13 @@
    library/xotcl/library/store/XOTclGdbm/, 
    library/xotcl/library/store/XOTclSdbm/, 
    library/xotcl/library/xml/TclExpat-1.1/
-
+- removed traces of xotcl.m4
 - removed build flags with-nxsh, with-xowish
   (since these are scripted now)
 - removed flag --with-tk (not needed anymore)
 
+- removed NXSH and XOWISH from Makefile.in
+
 TODO: 
 - extend coro regression test
 - remove traces of xowish. remove tclAppInt?