Index: trunk/Ohana/src/gcompare/Makefile
===================================================================
--- trunk/Ohana/src/gcompare/Makefile	(revision 2510)
+++ trunk/Ohana/src/gcompare/Makefile	(revision 10305)
@@ -4,17 +4,15 @@
 
 BIN	=	$(HOME)/bin
+LIB	=	$(HOME)/lib
 MAN	=	$(HOME)/doc
 SRC	=	$(HOME)/src
 INC	=	$(HOME)/include
-DESTBIN	=	$(LBIN)
-DESTLIB	=	$(LLIB)
-DESTINC	=	$(LINC)
-DESTMAN	=	$(LMAN)
+DESTBIN	=	$(BINDIR)
+DESTLIB	=	$(LIBDIR)
+DESTINC	=	$(INCDIR)
+DESTMAN	=	$(MANDIR)
 
-INCS	= 	-I$(INC) -I$(LINC) -I$(XINC)
-LIBS	= 	-L$(LLIB) -lFITS -lohana -lm 
-CFLAGS	=	$(INCS) 
-CCFLAGS	=	$(INCS) $(LIBS) 
-LFLAGS	=	$(LIBS)
+CFLAGS	=	-I$(INC) -I$(INCDIR) $(INCDIRS)
+LFLAGS	=	-L$(LIB) -L$(LIBDIR) $(LIBDIRS) -lFITS -lohana $(LIBFLAGS) 
 
 INSTALL = gcompare
@@ -67,3 +65,2 @@
 	rm -f $(DESTMAN)/gcompare.1
 	cp $(MAN)/gcompare.1 $(DESTMAN)/
-