Index: trunk/Ohana/src/opihi/Makefile.Common
===================================================================
--- trunk/Ohana/src/opihi/Makefile.Common	(revision 10341)
+++ trunk/Ohana/src/opihi/Makefile.Common	(revision 10342)
@@ -2,4 +2,6 @@
 # utilities #################################################
 # .SUFFIXES: .$(ARCH).o
+
+CFLAGS  =       -I$(INC) -I$(DESTINC) $(INCDIRS) -DHELPDIR_DEFAULT=$(HELP)
 
 $(BIN)/%.$(ARCH):
@@ -35,8 +37,8 @@
 
 %.help:
-	@if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
+	@if [ ! -d $(HELP) ]; then mkdir -p $(HELP); fi
 	rm -f $(HOME)/$*/help/*~
 	rm -f $(HOME)/$*/help/#*
-	for i in `find $(HOME)/$*/help -maxdepth 1 -type f`; do cp -f $$i $(DESTHLP); done
+	for i in `find $(HOME)/$*/help -maxdepth 1 -type f`; do cp -f $$i $(HELP); done
 %.clean:
 	rm -f $(BIN)/$*.$(ARCH)
@@ -58,4 +60,4 @@
 
 clean-help:
-	@if [ ! -d $(DESTHLP) ]; then mkdir -p $(DESTHLP); fi
-	rm -f $(DESTHLP)/*
+	@if [ ! -d $(HELP) ]; then mkdir -p $(HELP); fi
+	rm -f $(HELP)/*
Index: trunk/Ohana/src/opihi/cmd.astro/Makefile
===================================================================
--- trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/cmd.astro/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/cmd.astro
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # astro user commands ########################
Index: trunk/Ohana/src/opihi/cmd.basic/Makefile
===================================================================
--- trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/cmd.basic/Makefile	(revision 10342)
@@ -6,12 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/cmd.basic
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # basic user commands ########################
Index: trunk/Ohana/src/opihi/cmd.data/Makefile
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/cmd.data/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/cmd.data
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # data user commands ########################
Index: trunk/Ohana/src/opihi/dimm/Makefile
===================================================================
--- trunk/Ohana/src/opihi/dimm/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/dimm/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/dimm
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/dimm
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/dimm
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata -lsbig 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dimm user commands and support functions #####################
Index: trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- trunk/Ohana/src/opihi/dvo/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/dvo/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/dvo
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/dvo
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/dvo
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dvo user commands and support functions ########################
@@ -96,5 +88,5 @@
 install: $(DESTBIN)/dvo help
 
-help: cmd.basic.help cmd.data.help cmd.astro.help dvo.help
+help: clean-help cmd.basic.help cmd.data.help cmd.astro.help dvo.help
 
 $(funcs) $(cmds) $(libs) : $(INC)/dvoshell.h
Index: trunk/Ohana/src/opihi/lib.data/Makefile
===================================================================
--- trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/lib.data/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/lib.data
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # general numerical functions (libdata) #####################
Index: trunk/Ohana/src/opihi/lib.shell/Makefile
===================================================================
--- trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/lib.shell/Makefile	(revision 10342)
@@ -6,11 +6,4 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/lib.shell
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-#  
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS)
 
 # opihi shell functions (libopihi) ########################
Index: trunk/Ohana/src/opihi/mana/Makefile
===================================================================
--- trunk/Ohana/src/opihi/mana/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/mana/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/mana
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/mana
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/mana
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
@@ -50,5 +42,5 @@
 install: $(DESTBIN)/mana help
 
-help: cmd.basic.help cmd.data.help cmd.astro.help mana.help
+help: clean-help cmd.basic.help cmd.data.help cmd.astro.help mana.help
 
 .PHONY: mana
Index: trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/pantasks
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/pantasks
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/pantasks
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # sched user commands and support functions ########################
@@ -107,5 +99,5 @@
 install: $(DESTBIN)/pantasks $(DESTBIN)/pantasks_client $(DESTBIN)/pantasks_server help
 
-help: cmd.basic.help cmd.data.help cmd.astro.help pantasks.help
+help: clean-help cmd.basic.help cmd.data.help cmd.astro.help pantasks.help
 
 .PHONY: pantasks pantasks_client pantasks_server
Index: trunk/Ohana/src/opihi/pclient/Makefile
===================================================================
--- trunk/Ohana/src/opihi/pclient/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/pclient/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/pclient
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/pclient
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/pclient
 
 # link flags 
 LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # mana user commands and support functions ########################
Index: trunk/Ohana/src/opihi/pcontrol/Makefile
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10341)
+++ trunk/Ohana/src/opihi/pcontrol/Makefile	(revision 10342)
@@ -6,18 +6,10 @@
 INC     =       $(HOME)/include
 SDIR    =       $(HOME)/pcontrol
-#
-DESTBIN =       $(BINDIR)
-DESTLIB =       $(LIBDIR)
-DESTINC =       $(INCDIR)
-DESTMAN =       $(MANDIR)
-DESTHLP =       $(HELPDIR)/pcontrol
-
-#  compile flags
-CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
+HELP    =       $(DESTHELP)/pcontrol
 
 # link flags 
 LIBS1   =       -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -lshell -ldata 
-LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(DESTLIB) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # to build the non-threaded version, remove -lpthread and comment out