Diane Delgado's changes for a fixed table-locking order

[moira.git] / clients / moira / Imakefile

diff --git a/clients/moira/Imakefile b/clients/moira/Imakefile
index 624e7cdbba87bf661547874dd6194cc524caaf66..f0a4a3c063d2ce189a25bd401522c531c53c4122 100644 (file)
--- a/clients/moira/Imakefile
+++ b/clients/moira/Imakefile
@@ -20,17 +20,18 @@ MOBJS=      attach.o cluster.o delete.o globals.o lists.o main.o menu.o \
 NOBJS= namespace.o globals.o lists.o menu.o \
        pobox.o user.o utils.o misc.o
 OBJS=  ${MOBJS} ${NOBJS}
-INCLUDE= -I$(BUILDTOP)/include -I$(BUILDTOP)/lib -I.
+INCLUDE= -I$(BUILDTOP)/include -I$(BUILDTOP)/lib ${GDSSINC} -I/usr/athena/include -I.
 
-program(moira, ${MOBJS},${MR_LIBDEP} ${GDB_LIBDEP}, ${CLIBS} -lcurses -ltermcap,${PROGDIR})
-program(namespace, ${NOBJS},${MR_LIBDEP} ${GDB_LIBDEP}, ${CLIBS} -lcurses -ltermcap,${PROGDIR})
+
+program(moira, ${MOBJS},${MR_LIBDEP} ${GDB_LIBDEP}, ${LIBGDSS} ${CLIBS} ${CURSES},${PROGDIR})
+program(namespace, ${NOBJS},${MR_LIBDEP} ${GDB_LIBDEP}, ${LIBGDSS} ${CLIBS} ${CURSES},${PROGDIR})
 
 install::
-       $(RM) $(DESTDIR)/usr/athena/listmaint
-       ln -s moira $(DESTDIR)/usr/athena/listmaint
-       $(RM) $(DESTDIR)/usr/athena/dcmmaint
-       ln -s moira $(DESTDIR)/usr/athena/dcmmaint
-       $(RM) $(DESTDIR)/usr/athena/usermaint
-       ln -s moira $(DESTDIR)/usr/athena/usermaint
+       $(RM) $(DESTDIR)$(PROGDIR)/listmaint
+       ln -s moira $(DESTDIR)$(PROGDIR)/listmaint
+       $(RM) $(DESTDIR)$(PROGDIR)/dcmmaint
+       ln -s moira $(DESTDIR)$(PROGDIR)/dcmmaint
+       $(RM) $(DESTDIR)$(PROGDIR)/usermaint
+       ln -s moira $(DESTDIR)$(PROGDIR)/usermaint
 
 depend:: ${CODE}