Index: trunk/Ohana/src/kapa/Makefile
===================================================================
--- trunk/Ohana/src/kapa/Makefile	(revision 7040)
+++ trunk/Ohana/src/kapa/Makefile	(revision 10305)
@@ -5,6 +5,8 @@
 default: $(PROGRAM)
 
+LIB	=	$(HOME)/lib
 INC	=	$(HOME)/include
 BIN	=	$(HOME)/bin
+LIB	=	$(HOME)/lib
 BDIR	=	$(HOME)/button
 CDIR	=	$(HOME)/colorbar
@@ -16,13 +18,11 @@
 SDIR	=	$(HOME)/setup
 ZDIR	=	$(HOME)/zoom
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 #
-INCS	= 	-I$(LINC) -I$(XINC) -I$(INC) 
-LIBS	= 	-L$(LLIB) -L$(XLIB)
-CFLAGS  =	$(INCS) 
-LFLAGS	=	$(LIBS) -lFITS -lkapa -lohana -lX11 -lsocket -lnsl -lpng -lz -lm
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lkapa -ldvo -lFITS -lohana $(LIBFLAGS) 
 
 # local source / object files ########################