Index: trunk/Ohana/src/misc/Makefile
===================================================================
--- trunk/Ohana/src/misc/Makefile	(revision 9607)
+++ trunk/Ohana/src/misc/Makefile	(revision 10305)
@@ -4,19 +4,17 @@
 default: misc
 
-BIN	=	$(HOME)/bin
+SRC	=	$(HOME)/src
 LIB	= 	$(HOME)/lib
-SRC	=	$(HOME)/src
 INC	=	$(HOME)/include
 MAN	=	$(HOME)/doc
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+BIN	=	$(HOME)/bin
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
 #  
-INCS	= 	-I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lFITS -lohana -lm
-CFLAGS	=	$(INCS)
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 PROGRAMS = gconfig mknames fhead ftable fields list_astro glockfile \