Index: /trunk/Ohana/.cvsignore
===================================================================
--- /trunk/Ohana/.cvsignore	(revision 12841)
+++ /trunk/Ohana/.cvsignore	(revision 12842)
@@ -5,5 +5,5 @@
 man
 CVS
-Configure
 ohana-config
 Makefile
+Makefile.System
Index: /trunk/Ohana/Makefile.System.in
===================================================================
--- /trunk/Ohana/Makefile.System.in	(revision 12842)
+++ /trunk/Ohana/Makefile.System.in	(revision 12842)
@@ -0,0 +1,28 @@
+# Configure file for Ohana Package
+# the values of the form @WORD@ are filled in by configure
+
+# location of the package and architecture
+ROOT    = @ROOTDIR@
+ARCH    = @ARCHVAL@
+
+# destination directories:
+DESTBIN	 = @BINDIR@
+DESTINC	 = @INCDIR@
+DESTLIB	 = @LIBDIR@
+DESTMAN	 = @MANDIR@
+DESTDATA = @DATADIR@
+
+# C compiler options
+CC       = @CC@
+CFLAGS   = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS  = @LDFLAGS@
+DLLTYPE  = @DLLTYPE@
+
+# flags for external dependencies
+INCDIRS  = @INCDIRS@
+LIBDIRS  = @LIBDIRS@
+LIBFLAGS = @LIBFLAGS@
+
+# select the appropriate version of ranlib
+RANLIB = @RANLIB@
Index: /trunk/Ohana/configure
===================================================================
--- /trunk/Ohana/configure	(revision 12841)
+++ /trunk/Ohana/configure	(revision 12842)
@@ -39,4 +39,3 @@
 done
 
-echo ./configure.tcsh $args
 ./configure.tcsh $args
Index: /trunk/Ohana/configure.tcsh
===================================================================
--- /trunk/Ohana/configure.tcsh	(revision 12841)
+++ /trunk/Ohana/configure.tcsh	(revision 12842)
@@ -416,7 +416,7 @@
 echo 
 
-# the config.tools fixconf operations below interpolate values in Configure
-if (-e Configure) mv Configure Configure.bak
-cp Configure.in Configure
+# the config.tools fixconf operations below interpolate values in Makefile.System
+if (-e Makefile.System) mv Makefile.System Makefile.System.bak
+cp Makefile.System.in Makefile.System
 
 # we don't currently need to modify the Makefile but since configure
Index: /trunk/Ohana/src/addstar/Makefile
===================================================================
--- /trunk/Ohana/src/addstar/Makefile	(revision 12841)
+++ /trunk/Ohana/src/addstar/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: addstar (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/addstar
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/delstar/Makefile
===================================================================
--- /trunk/Ohana/src/delstar/Makefile	(revision 12841)
+++ /trunk/Ohana/src/delstar/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: addstar (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/delstar
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/elixir/Makefile
===================================================================
--- /trunk/Ohana/src/elixir/Makefile	(revision 12841)
+++ /trunk/Ohana/src/elixir/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: elixir (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/elixir
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/fixcat/Makefile
===================================================================
--- /trunk/Ohana/src/fixcat/Makefile	(revision 12841)
+++ /trunk/Ohana/src/fixcat/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: uniphot (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/fixcat
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/gastro/Makefile
===================================================================
--- /trunk/Ohana/src/gastro/Makefile	(revision 12841)
+++ /trunk/Ohana/src/gastro/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: gastro (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/gastro
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/gastro2/Makefile
===================================================================
--- /trunk/Ohana/src/gastro2/Makefile	(revision 12841)
+++ /trunk/Ohana/src/gastro2/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: gastro2 (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/gastro2
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/gcompare/Makefile
===================================================================
--- /trunk/Ohana/src/gcompare/Makefile	(revision 12841)
+++ /trunk/Ohana/src/gcompare/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: gcompare (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/gcompare
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/getstar/Makefile
===================================================================
--- /trunk/Ohana/src/getstar/Makefile	(revision 12841)
+++ /trunk/Ohana/src/getstar/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: getstar (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/getstar
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/gophot/Makefile
===================================================================
--- /trunk/Ohana/src/gophot/Makefile	(revision 12841)
+++ /trunk/Ohana/src/gophot/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: gophot (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/gophot
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/imclean/Makefile
===================================================================
--- /trunk/Ohana/src/imclean/Makefile	(revision 12841)
+++ /trunk/Ohana/src/imclean/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: imclean (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/imclean
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/imregister/Makefile
===================================================================
--- /trunk/Ohana/src/imregister/Makefile	(revision 12841)
+++ /trunk/Ohana/src/imregister/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: all imregister etc (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/imregister
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/kapa/Makefile
===================================================================
--- /trunk/Ohana/src/kapa/Makefile	(revision 12841)
+++ /trunk/Ohana/src/kapa/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: kapa (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/kapa
 LIB	=	$(HOME)/lib
Index: /trunk/Ohana/src/kii/Makefile
===================================================================
--- /trunk/Ohana/src/kii/Makefile	(revision 12841)
+++ /trunk/Ohana/src/kii/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: kii (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/kii
 LIB	=	$(HOME)/lib
Index: /trunk/Ohana/src/libautocode/Makefile
===================================================================
--- /trunk/Ohana/src/libautocode/Makefile	(revision 12841)
+++ /trunk/Ohana/src/libautocode/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: install autocode latex objects"
 
-include ../../Configure
+include ../../Makefile.System
 HOME	=	$(ROOT)/src/libautocode
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/libdvo/Makefile
===================================================================
--- /trunk/Ohana/src/libdvo/Makefile	(revision 12841)
+++ /trunk/Ohana/src/libdvo/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: install libdvo clean dist"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/libdvo
 AUTO	=	$(ROOT)/src/libautocode
Index: /trunk/Ohana/src/libfits/Makefile
===================================================================
--- /trunk/Ohana/src/libfits/Makefile	(revision 12841)
+++ /trunk/Ohana/src/libfits/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: install libfits man clean dist"
 
-include ../../Configure
+include ../../Makefile.System
 HOME	=	$(ROOT)/src/libfits
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/libkapa/Makefile
===================================================================
--- /trunk/Ohana/src/libkapa/Makefile	(revision 12841)
+++ /trunk/Ohana/src/libkapa/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: install libkapa clean dist"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/libkapa
 LIB	= 	$(HOME)/lib
Index: /trunk/Ohana/src/libohana/Makefile
===================================================================
--- /trunk/Ohana/src/libohana/Makefile	(revision 12841)
+++ /trunk/Ohana/src/libohana/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: install libohana clean dist"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/libohana
 BIN	= 	$(HOME)/bin
Index: /trunk/Ohana/src/libtap/Makefile
===================================================================
--- /trunk/Ohana/src/libtap/Makefile	(revision 12841)
+++ /trunk/Ohana/src/libtap/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: install libtap clean dist"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/libtap
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/lightcurve/Makefile
===================================================================
--- /trunk/Ohana/src/lightcurve/Makefile	(revision 12841)
+++ /trunk/Ohana/src/lightcurve/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: lightcurve (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/lightcurve
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/markrock/Makefile
===================================================================
--- /trunk/Ohana/src/markrock/Makefile	(revision 12841)
+++ /trunk/Ohana/src/markrock/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: markrock (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/markrock
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/markstar/Makefile
===================================================================
--- /trunk/Ohana/src/markstar/Makefile	(revision 12841)
+++ /trunk/Ohana/src/markstar/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: markstar (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/markstar
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/misc/Makefile
===================================================================
--- /trunk/Ohana/src/misc/Makefile	(revision 12841)
+++ /trunk/Ohana/src/misc/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: misc (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/misc
 SRC	=	$(HOME)/src
Index: /trunk/Ohana/src/mosastro/Makefile
===================================================================
--- /trunk/Ohana/src/mosastro/Makefile	(revision 12841)
+++ /trunk/Ohana/src/mosastro/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: mosastro (default) mkstandards mkobs warptest"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/mosastro
 LIB	=	$(HOME)/lib
Index: /trunk/Ohana/src/nightd/Makefile
===================================================================
--- /trunk/Ohana/src/nightd/Makefile	(revision 12841)
+++ /trunk/Ohana/src/nightd/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: nightd (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/nightd
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/opihi/cmd.astro/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: libastrocmd
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 BIN     =       $(HOME)/bin
Index: /trunk/Ohana/src/opihi/cmd.basic/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: libbasiccmd
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 SRC     =       $(HOME)/cmd.basic
Index: /trunk/Ohana/src/opihi/cmd.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: libdatacmd
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 SRC     =       $(HOME)/cmd.data
Index: /trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dimm/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/dimm/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: dimm
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 BIN     =       $(HOME)/bin
Index: /trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/dvo/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/dvo/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: dvo
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 BIN     =       $(HOME)/bin
Index: /trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/lib.data/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: libdata
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 BIN     =       $(HOME)/bin
Index: /trunk/Ohana/src/opihi/lib.shell/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: libshell
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 BIN     =       $(HOME)/bin
Index: /trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/mana/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/mana/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: mana
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 SRC     =       $(HOME)/mana
Index: /trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/pantasks/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: pantasks pantasks_client pantasks_server
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 SRC     =       $(HOME)/pantasks
Index: /trunk/Ohana/src/opihi/pantasks/test/load.sh
===================================================================
--- /trunk/Ohana/src/opihi/pantasks/test/load.sh	(revision 12842)
+++ /trunk/Ohana/src/opihi/pantasks/test/load.sh	(revision 12842)
@@ -0,0 +1,37 @@
+
+# a basic task which just runs 'sleep'
+task	       basic
+  # command      sleep 1
+  command      echo hi
+  host         local
+
+  periods      -poll 0.01
+  periods      -exec 0.01
+  periods      -timeout 20
+  npending 5
+  
+  stdout tmp.txt
+  stderr tmp.txt
+
+  task.exec
+    # echo "create command"
+  end
+
+  # success
+  task.exit    0
+    $Npass ++
+    # echo done sleep
+    # status
+    # halt
+  end
+
+  # default exit status
+  task.exit    default
+    echo       "basic: exit status: $EXIT"
+  end
+
+  # operation times out?
+  task.exit    timeout
+    echo       "basic: timeout"
+  end
+end
Index: /trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pclient/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/pclient/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: pclient
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 BIN     =       $(HOME)/bin
Index: /trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 12841)
+++ /trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 12842)
@@ -1,5 +1,5 @@
 default: pcontrol
 
-include ../../../Configure
+include ../../../Makefile.System
 HOME    =       $(ROOT)/src/opihi
 BIN     =       $(HOME)/bin
Index: /trunk/Ohana/src/perl/Makefile
===================================================================
--- /trunk/Ohana/src/perl/Makefile	(revision 12841)
+++ /trunk/Ohana/src/perl/Makefile	(revision 12842)
@@ -1,3 +1,3 @@
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/perl
 
Index: /trunk/Ohana/src/photdbc/Makefile
===================================================================
--- /trunk/Ohana/src/photdbc/Makefile	(revision 12841)
+++ /trunk/Ohana/src/photdbc/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: photdbc (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/photdbc
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/relastro/Makefile
===================================================================
--- /trunk/Ohana/src/relastro/Makefile	(revision 12841)
+++ /trunk/Ohana/src/relastro/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: relastro (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/relastro
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/relphot/Makefile
===================================================================
--- /trunk/Ohana/src/relphot/Makefile	(revision 12841)
+++ /trunk/Ohana/src/relphot/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: relphot (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/relphot
 BIN	=	$(HOME)/bin
Index: /trunk/Ohana/src/shell/Makefile
===================================================================
--- /trunk/Ohana/src/shell/Makefile	(revision 12841)
+++ /trunk/Ohana/src/shell/Makefile	(revision 12842)
@@ -1,3 +1,3 @@
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/shell
 
Index: /trunk/Ohana/src/skycalc/Makefile
===================================================================
--- /trunk/Ohana/src/skycalc/Makefile	(revision 12841)
+++ /trunk/Ohana/src/skycalc/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME	=	$(ROOT)/src/skycalc
 BIN	= 	$(HOME)/bin
Index: /trunk/Ohana/src/tcl/Makefile
===================================================================
--- /trunk/Ohana/src/tcl/Makefile	(revision 12841)
+++ /trunk/Ohana/src/tcl/Makefile	(revision 12842)
@@ -1,3 +1,3 @@
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/tcl
 
Index: /trunk/Ohana/src/tools/Makefile
===================================================================
--- /trunk/Ohana/src/tools/Makefile	(revision 12841)
+++ /trunk/Ohana/src/tools/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: tools (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME 	=	$(ROOT)/src/tools
 SRC	=	$(HOME)/src
Index: /trunk/Ohana/src/uniphot/Makefile
===================================================================
--- /trunk/Ohana/src/uniphot/Makefile	(revision 12841)
+++ /trunk/Ohana/src/uniphot/Makefile	(revision 12842)
@@ -3,5 +3,5 @@
 	@echo "make options: uniphot (default)"
 
-include ../../Configure
+include ../../Makefile.System
 HOME    =       $(ROOT)/src/uniphot
 BIN	=	$(HOME)/bin