Index: trunk/Ohana/src/opihi/dvo/Makefile
===================================================================
--- trunk/Ohana/src/opihi/dvo/Makefile	(revision 10072)
+++ trunk/Ohana/src/opihi/dvo/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/dvo
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/dvo
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/dvo
 
 #  compile flags
-INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
-CFLAGS  =       $(INCS) -DHELPDIR_DEFAULT=$(DESTHLP)
+CFLAGS  =       -I$(INC) -I$(INCDIR) $(INCDIRS) -DHELPDIR_DEFAULT=$(DESTHLP)
 
 # link flags 
-LIBS    = 	-L$(LIB) -L$(LLIB) -L$(XLIB)
-LIBS1   =       -lsocket -lnsl -lreadline $(TLIB) -ljpeg -ldvo -lkapa -lFITS -lohana -lX11 -lm
+LIBS1   =       -ldvo -lkapa -lFITS -lohana $(LIBFLAGS)
 LIBS2   =       -lbasiccmd -ldatacmd -lastrocmd -lshell -ldata 
-LFLAGS  =       $(LIBS) $(LIBS2) $(LIBS1) 
+LFLAGS  =       -L$(LIB) -L$(LIBDIR) $(LIBDIRS) $(LIBS2) $(LIBS1) 
 
 # dvo user commands and support functions ########################
@@ -92,7 +90,7 @@
 $(DESTLIB)/libdatacmd.a
 
-dvo: $(BIN)/dvo.$(ARCH)
+dvo: $(BIN)/dvo.$(ARCH) $(libs)
 
-$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds) $(libs)
+$(BIN)/dvo.$(ARCH) : $(funcs) $(cmds)
 
 install: $(DESTBIN)/dvo help