--- erpcd/Makefile.orig	Wed Jun 24 17:23:53 1998
+++ erpcd/Makefile	Sun Sep 28 00:23:28 2003
@@ -227,6 +227,9 @@
 CDBCFILES = acp_dbm_lib.c
 CDBOFILES = acp_dbm_lib.o
 
+CFLAGS += -I../inc
+LIBFLAG = -lcrypt
+
 CFILES =	${ERPCFILES} ch_passwd.c convert.c ${COMCFILES} ${STUBCFILES}\
 		${CDBCFILES} ${SECURIDCFILES} ${ENIGMACFILES} acp_dbm.c \
 		tms_dbm.c tms_convert.c spy.c
@@ -262,58 +265,58 @@
 erpcd:	${ERPOFILES} ${COMOFILES} ../libannex/libannex.a ../netadm/netadm.a \
 	${ENIGMAFILES} ${SECURIDFILES} ${KERBEROSLIB} ${STUBLFILES}\
 		${CDBOFILES} ${SECURIDOFILES} ${ENIGMAOFILES}
-		@/bin/echo "*** Building erpcd utility ***" > /dev/tty
+		@/bin/echo "*** Building erpcd utility ***"
 		${CC} ${BUILD_CORRECTION} ${CFLAGS} -o erpcd \
 			${ERPOFILES} ${SECURIDOFILES} ${COMOFILES} \
 			${ENIGMAOFILES} ${CDBOFILES}\
 			../libannex/libannex.a ../netadm/netadm.a \
 			${SECURIDFILES} ${KERBEROSLIB} ${ENIGMAFILES} \
 			${STUBLINKING} ${LIBFLAG}
-		@/bin/echo "*** Done building erpcd utility ***" > /dev/tty
+		@/bin/echo "*** Done building erpcd utility ***"
 
 ch_passwd:	ch_passwd.o ${COMOFILES} ${CDBOFILES} ../libannex/libannex.a 
-		@/bin/echo "*** Building ch_passwd utility ***" > /dev/tty
+		@/bin/echo "*** Building ch_passwd utility ***"
 		${CC} ${CFLAGS} -o ch_passwd ch_passwd.o ${COMOFILES} \
 	        ${CDBOFILES} ../libannex/libannex.a ${LIBFLAG}
-		@/bin/echo "*** Done building ch_passwd utility ***" > /dev/tty
+		@/bin/echo "*** Done building ch_passwd utility ***"
 
 convert:	convert.o ${COMOFILES} ../libannex/libannex.a
-		@/bin/echo "*** Building convert utility ***" > /dev/tty
+		@/bin/echo "*** Building convert utility ***"
 		${CC} ${CFLAGS} -o convert convert.o ${COMOFILES} \
 			../libannex/libannex.a ${LIBFLAG}
-		@/bin/echo "*** Done building convert utility ***" > /dev/tty
+		@/bin/echo "*** Done building convert utility ***"
 
 acp_dbm:        acp_dbm.o ${CDBOFILES} ../libannex/libannex.a
-		@/bin/echo "*** Building acp_dbm utility ***" > /dev/tty
+		@/bin/echo "*** Building acp_dbm utility ***"
 		${CC} ${CFLAGS} -o acp_dbm acp_dbm.o ${CDBOFILES} \
                         ../libannex/libannex.a ${LIBFLAG}
-		@/bin/echo "*** Done building acp_dbm utility ***" > /dev/tty
+		@/bin/echo "*** Done building acp_dbm utility ***"
 
 tms_dbm:        tms_dbm.o tms_lib.o ../libannex/libannex.a ../netadm/netadm.a
-		@/bin/echo "*** Building tms_dbm utility ***" > /dev/tty
+		@/bin/echo "*** Building tms_dbm utility ***"
 		${CC} ${CFLAGS} -o tms_dbm tms_dbm.o tms_lib.o \
 		../libannex/libannex.a  ../netadm/netadm.a ${LIBFLAG}
-		@/bin/echo "*** Done building tms_dbm utility ***" > /dev/tty
+		@/bin/echo "*** Done building tms_dbm utility ***"
 
 tms_convert:    tms_convert.o tms_lib.o ../libannex/libannex.a \
 		../netadm/netadm.a
-		@/bin/echo "*** Building tms_convert utility ***" > /dev/tty
+		@/bin/echo "*** Building tms_convert utility ***"
 		${CC} ${CFLAGS} -o tms_convert tms_convert.o tms_lib.o \
 		../libannex/libannex.a  ../netadm/netadm.a ${LIBFLAG}
-		@/bin/echo "*** Done building tms_convert utility ***" > /dev/tty
+		@/bin/echo "*** Done building tms_convert utility ***"
 
 spy:            spy.o ../libannex/erpc_subr.o ../libannex/libannex.a \
 		../netadm/netadm.a
-		@/bin/echo "*** Building spy utility ***" > /dev/tty
+		@/bin/echo "*** Building spy utility ***"
 		${CC} ${CFLAGS} -o spy spy.o ../libannex/erpc_subr.o \
 		../libannex/libannex.a  ../netadm/netadm.a ${LIBFLAG}
-		@/bin/echo "*** Done building spy utility ***" > /dev/tty
+		@/bin/echo "*** Done building spy utility ***"
 
 acplint:	acplint.o getacpuser.o getacpstubs.o env_parser.o time_parser.o
-		@/bin/echo "*** Building acplint utility ***" > /dev/tty
+		@/bin/echo "*** Building acplint utility ***"
 		${CC} ${CFLAGS} -g -o acplint acplint.o getacpuser.o getacpstubs.o \
 			env_parser.o time_parser.o ../libannex/libannex.a ${LIBFLAG}
-		@/bin/echo "*** Done building acplint utility ***" > /dev/tty
+		@/bin/echo "*** Done building acplint utility ***"
  
 lintup:
 		lint ${ALLFLAGS} ${ERPCFILES} ${COMCFILES} ${CDBCFILES}
@@ -346,7 +349,7 @@
 STOPPREFIX = /etc/rc0.d/K09
 
 install-initd:
-	@echo "*** Installing init.d start and stop script ***" > /dev/tty
+	@echo "*** Installing init.d start and stop script ***"
 	$(INSTALL) sysexec $(INITD) $(ANNEXINIT)
 	$(RM) -f /etc/rc[20].d/[SK][0-9][0-9]$(ANNEXINIT)
 	ln $(INITD)/$(ANNEXINIT) $(STARTPREFIX)$(ANNEXINIT)