Link -lkrb before -lcom_err.

8 files changed, 29 insertions, 23 deletions

diff --git a/clients/xzwrite/Imakefile b/clients/xzwrite/Imakefile
index 4fba5df..b838c87 100644
--- a/clients/xzwrite/Imakefile
+++ b/clients/xzwrite/Imakefile
@@ -5,13 +5,13 @@
 /**/#
 /**/#	$Source$
 /**/#	$Author$
-/**/#	$Header$
+/**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB} ${DES_LIB} $(DYN_LIB) \
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} $(DYN_LIB) ${COMERR_LIB} \
 	-lXaw -lXmu -lXt -lXext -lX11
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB} \
-	${DES_LINTLIB} $(DYN_LINTLIB)
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} \
+	$(DYN_LINTLIB) ${COMERR_LINTLIB}
 
 SRCS	= interface.c resource.c destlist.c util.c bfgets.c \
 	gethomedir.c dest_window.c xzwrite.c edit_window.c zephyr.c\
diff --git a/clients/zaway/Imakefile b/clients/zaway/Imakefile
index 489add2..f90b488 100644
--- a/clients/zaway/Imakefile
+++ b/clients/zaway/Imakefile
@@ -8,8 +8,8 @@
 /**/#	$Header$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB} ${DES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB}
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zaway.c
 OBJS = zaway.o
 
diff --git a/clients/zmailnotify/Imakefile b/clients/zmailnotify/Imakefile
index b6dc628..190035d 100644
--- a/clients/zmailnotify/Imakefile
+++ b/clients/zmailnotify/Imakefile
@@ -8,8 +8,8 @@
 /**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB} ${DES_LIB} ${HES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB}
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB} ${HES_LIB}
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${COMERR_LINTLIB} ${DES_LINTLIB}
 DEFINES= -DKPOP
 
 SRCS = zmailnotify.c
@@ -21,3 +21,9 @@ CODE= ${SRCS} Imakefile
 normal_obj_rule()
 
 program(zmailnotify,${OBJS},,${LIBS},${CLIENTDIR})
+
+#ifdef ATHENA_COMPAT
+all::
+	$(RM) $(DESTDIR)/usr/athena/zmailnotify
+	ln -s $(CLIENTDIR)/zmailnotify $(DESTDIR)/usr/athena/zmailnofity
+#endif
diff --git a/clients/znol/Imakefile b/clients/znol/Imakefile
index eeeba73..5c16c6d 100644
--- a/clients/znol/Imakefile
+++ b/clients/znol/Imakefile
@@ -5,11 +5,11 @@
 /**/#
 /**/#	$Source$
 /**/#	$Author$
-/**/#	$Header$
+/**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB} ${DES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB}
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = znol.c
 OBJS = znol.o
 
diff --git a/clients/zpopnotify/Imakefile b/clients/zpopnotify/Imakefile
index 93b3316..91b6851 100644
--- a/clients/zpopnotify/Imakefile
+++ b/clients/zpopnotify/Imakefile
@@ -5,11 +5,11 @@
 /**/#
 /**/#	$Source$
 /**/#	$Author$
-/**/#	$Header$
+/**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB}
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${COMERR_LIB}
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zpopnotify.c
 OBJS = zpopnotify.o
 
diff --git a/clients/zshutdown_notify/Imakefile b/clients/zshutdown_notify/Imakefile
index c6817d2..fc81079 100644
--- a/clients/zshutdown_notify/Imakefile
+++ b/clients/zshutdown_notify/Imakefile
@@ -5,11 +5,11 @@
 /**/#
 /**/#	$Source$
 /**/#	$Author$
-/**/#	$Header$
+/**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB} ${DES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB}
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zshutdown_notify.c
 OBJS = zshutdown_notify.o
 
diff --git a/clients/zstat/Imakefile b/clients/zstat/Imakefile
index a0f23be..8da884a 100644
--- a/clients/zstat/Imakefile
+++ b/clients/zstat/Imakefile
@@ -5,10 +5,10 @@
 /**/#
 /**/#	$Source$
 /**/#	$Author$
-/**/#	$Header$
+/**/#	$Id$
 /**/#
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB} ${DES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB}
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zstat.c
 OBJS = zstat.o
 HDRS = zserver.h
diff --git a/clients/zwrite/Imakefile b/clients/zwrite/Imakefile
index b60e17e..b522afb 100644
--- a/clients/zwrite/Imakefile
+++ b/clients/zwrite/Imakefile
@@ -5,11 +5,11 @@
 /**/#
 /**/#	$Source$
 /**/#	$Author$
-/**/#	$Header$
+/**/#	$Id$
 /**/#
 
-LIBS= ${ZEPHYR_LIB} ${COMERR_LIB} ${KRB_LIB} ${DES_LIB}
-LINTLIBS= ${ZEPHYR_LINTLIB} ${COMERR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB}
+LIBS= ${ZEPHYR_LIB} ${KRB_LIB} ${DES_LIB} ${COMERR_LIB}
+LINTLIBS= ${ZEPHYR_LINTLIB} ${KRB_LINTLIB} ${DES_LINTLIB} ${COMERR_LINTLIB}
 SRCS = zwrite.c
 OBJS = zwrite.o