Index: trunk/Ohana/src/opihi/pantasks/Makefile
===================================================================
--- trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10072)
+++ trunk/Ohana/src/opihi/pantasks/Makefile	(revision 10305)
@@ -7,19 +7,17 @@
 SDIR    =       $(HOME)/pantasks
 #
-DESTBIN =       $(LBIN)
-DESTLIB =       $(LLIB)
-DESTINC =       $(LINC)
-DESTMAN =       $(LMAN)
-DESTHLP =       $(LHLP)/pantasks
+DESTBIN =       $(BINDIR)
+DESTLIB =       $(LIBDIR)
+DESTINC =       $(INCDIR)
+DESTMAN =       $(MANDIR)
+DESTHLP =       $(HELPDIR)/pantasks
 
 #  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 -lpthread -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) 
 
 # sched user commands and support functions ########################
@@ -93,12 +91,12 @@
 $(DESTLIB)/libdatacmd.a
 
-pantasks: $(BIN)/pantasks.$(ARCH)
-$(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds) $(libs)
+pantasks: $(BIN)/pantasks.$(ARCH) $(libs)
+$(BIN)/pantasks.$(ARCH) : $(single) $(funcs) $(cmds)
 
-pantasks_client: $(BIN)/pantasks_client.$(ARCH)
-$(BIN)/pantasks_client.$(ARCH) : $(client) $(libs)
+pantasks_client: $(BIN)/pantasks_client.$(ARCH) $(libs)
+$(BIN)/pantasks_client.$(ARCH) : $(client)
 
-pantasks_server: $(BIN)/pantasks_server.$(ARCH)
-$(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds) $(libs)
+pantasks_server: $(BIN)/pantasks_server.$(ARCH) $(libs)
+$(BIN)/pantasks_server.$(ARCH) : $(server) $(funcs) $(cmds)
 	@if [ ! -d $(BIN) ]; then mkdir -p $(BIN); fi
 	$(CC) -o $@ $^ $(LFLAGS)