this should be using the GDSSLIB and GDSSINCL defined in config.Imakefile

also GDSSINCL needs to be before /usr/athena/include, because there is a
a broken gdss.h in the later in 7.7I for the sun

diff --git a/clients/moira/Imakefile b/clients/moira/Imakefile
index 72b24f8e1a239486ceb681c691f7d44f9ba2605c..f0a4a3c063d2ce189a25bd401522c531c53c4122 100644 (file)
--- a/clients/moira/Imakefile
+++ b/clients/moira/Imakefile
@@ -20,16 +20,7 @@ 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}
-#ifdef GDSS
-INCLUDE= -I$(BUILDTOP)/include -I$(BUILDTOP)/lib -I/usr/athena/include \
-       -I/mit/gdss/include -I.
-#else
-INCLUDE= -I$(BUILDTOP)/include -I$(BUILDTOP)/lib -I/usr/athena/include -I.
-#endif
-
-#ifdef GDSS
-LIBGDSS = -L/mit/gdss/`machtype` -lgdss
-#endif
+INCLUDE= -I$(BUILDTOP)/include -I$(BUILDTOP)/lib ${GDSSINC} -I/usr/athena/include -I.
 
 
 program(moira, ${MOBJS},${MR_LIBDEP} ${GDB_LIBDEP}, ${LIBGDSS} ${CLIBS} ${CURSES},${PROGDIR})