3 files changed, 51 insertions, 14 deletions
diff --git a/clients/zpopnotify/Imakefile b/clients/zpopnotify/Imakefile
deleted file mode 100644
index d0f4439..0000000
--- a/clients/zpopnotify/Imakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-/**/#	Copyright 1988, 1993 Massachusetts Institute of Technology.
-/**/#
-/**/#	For copying and distribution information, see the file
-/**/#	"mit-copyright.h". 
-/**/#
-/**/#	$Id$
-
-SRCS = zpopnotify.c
-OBJS = zpopnotify.o
-
-SimpleProgram(zpopnotify,$(OBJS) $(ZLIB),$(ZLIBS),$(ATHETCDIR))
-install_man(zpopnotify.8,zpopnotify.8)
-create_depend($(SRCS))
diff --git a/clients/zpopnotify/Makefile.in b/clients/zpopnotify/Makefile.in
new file mode 100644
index 0000000..ca38dd7
--- /dev/null
+++ b/clients/zpopnotify/Makefile.in
@@ -0,0 +1,47 @@
+SHELL = /bin/sh
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datadir=@datadir@
+confdir=@confdir@
+sbindir=@sbindir@
+lsbindir=@lsbindir@
+
+includedir=${prefix}/include
+mandir=${prefix}/man
+libdir=${exec_prefix}/lib
+bindir=${exec_prefix}/bin
+
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+BUILDTOP=../..
+VPATH=@srcdir@
+CC=@CC@
+INSTALL=@INSTALL@
+
+DEBUG=-O
+CFLAGS=${DEBUG} -I${top_srcdir}/h -I${BUILDTOP}/h @CPPFLAGS@
+LDFLAGS=${DEBUG} -L${BUILDTOP}/lib/zephyr @ET_LDFLAGS@ @LDFLAGS@
+LIBS=-lzephyr @LIBS@ -lcom_err
+
+OBJS=	zpopnotify.o
+
+all: zpopnotify
+
+zpopnotify: ${OBJS} ${BUILDTOP}/lib/zephyr/libzephyr.a @ETDEP@
+	${CC} ${LDFLAGS} -o $@ ${OBJS} ${LIBS}
+
+check:
+
+install: zpopnotify
+	${INSTALL} -m 755 -s zpopnotify ${DESTDIR}${sbindir}
+	${INSTALL} -m 644 ${srcdir}/zpopnotify.8 ${DESTDIR}${mandir}/man8
+
+clean:
+	rm -f ${OBJS} zpopnotify
+
+${OBJS}: ${top_srcdir}/h/sysdep.h ${BUILDTOP}/h/config.h
+${OBJS}: ${BUILDTOP}/h/zephyr/zephyr.h ${BUILDTOP}/h/zephyr/zephyr_err.h
+
+.PHONY: all check install clean
+
diff --git a/clients/zpopnotify/zpopnotify.c b/clients/zpopnotify/zpopnotify.c
index ee298ad..ba4e376 100644
--- a/clients/zpopnotify/zpopnotify.c
+++ b/clients/zpopnotify/zpopnotify.c
@@ -11,13 +11,16 @@
  *	"mit-copyright.h". 
  */
 
-#include <zephyr/mit-copyright.h>
 
+#include <sysdep.h>
+#include <zephyr/mit-copyright.h>
 #include <zephyr/zephyr.h>
+#include <stdio.h>
 #include <netdb.h>
 #include <string.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN */
 #include <com_err.h>
+#include <errno.h>
 
 #ifndef lint
 static char rcsid_zpopnotify_c[] = "$Header$";