avoid core dump on return receipt processing; clean up return receipt

[unix-history] / usr / src / usr.sbin / lpr / Makefile

diff --git a/usr/src/usr.sbin/lpr/Makefile b/usr/src/usr.sbin/lpr/Makefile
index 166232e..449ecc7 100644 (file)
--- a/usr/src/usr.sbin/lpr/Makefile
+++ b/usr/src/usr.sbin/lpr/Makefile
@@ -16,21 +16,24 @@ ROOT=root
 DAEMON=daemon
 SPGRP=daemon
 
 DAEMON=daemon
 SPGRP=daemon
 

-all: lpd lpr sq dq lpdrestart filters
+all: lpd rlpr lpr lpq lprm lpdrestart filters

 
 

-filters: necf lpf laf
+filters: laf lpf necf

 
 

-lpd:   lpd.o lpdchar.o printcap.o
-       ${CC} -o lpd ${LDFLAGS} lpd.o lpdchar.o printcap.o
+lpd:   lpd.o lpdchar.o printcap.o getq.o
+       ${CC} -o lpd ${LDFLAGS} lpd.o lpdchar.o printcap.o getq.o
+
+rlpr:  rlpr.o printcap.o
+       ${CC} -o rlpr ${LDFLAGS} rlpr.o printcap.o

 
 lpr:   lpr.o printcap.o
 
 lpr:   lpr.o printcap.o

-       ${CC} -o lpr ${LDFLAGS} lpr.o printcap.o
+       ${CC} -o lpr ${LDFLAGS} lpr.o -ljobs printcap.o

 
 

-sq:    sq.o printcap.o
-       ${CC} -o sq ${LDFLAGS} sq.o -ltermcap printcap.o
+lpq:   lpq.o printcap.o getq.o
+       ${CC} -o lpq ${LDFLAGS} lpq.o -ltermcap printcap.o getq.o

 
 

-dq:    dq.o printcap.o
-       ${CC} -o dq ${LDFLAGS} dq.o printcap.o
+lprm:  lprm.o printcap.o
+       ${CC} -o lprm ${LDFLAGS} lprm.o printcap.o

 
 lpdrestart: lpdrestart.o
        ${CC} -o lpdrestart ${LDFLAGS} lpdrestart.o
 
 lpdrestart: lpdrestart.o
        ${CC} -o lpdrestart ${LDFLAGS} lpdrestart.o


@@ -44,27 +47,23 @@ lpf:        lpf.c
 necf:  necf.c
        ${CC} -o necf ${CFLAGS} ${LDFLAGS} necf.c
 
 necf:  necf.c
        ${CC} -o necf ${CFLAGS} ${LDFLAGS} necf.c
 

-lpr.o lpd.o sq.o dq.o lpdrestart.o: lp.local.h
-
-install: all
-       cp lpd ${LIBDIR}/lpd
-       cp sq ${BINDIR}/sq
-       cp dq ${BINDIR}/dq
-       cp lpr ${BINDIR}/lpr
-#      rm -f ${BINDIR}/opr ${BINDIR}/print
-#      ln ${BINDIR}/lpr ${BINDIR}/print
-#      ln ${BINDIR}/lpr ${BINDIR}/opr
-       chown ${ROOT} ${BINDIR}/lpr ${BINDIR}/sq
-       chown ${DAEMON} ${BINDIR}/dq ${LIBDIR}/lpd
-       chgrp ${SPGRP} ${LIBDIR}/lpd ${BINDIR}/lpr ${BINDIR}/dq ${BINDIR}/sq
-       chmod 6711 ${LIBDIR}/lpd ${BINDIR}/lpr ${BINDIR}/dq
-       chmod 2711 ${BINDIR}/sq
-       chmod 775 ${SPOOLDIR}
-       chgrp ${SPGRP} ${SPOOLDIR}
+lpd.o rlpr.o lpr.o lpq.o lprm.o lpdrestart.o: lp.local.h
+lpd.o lpq.o getq.o: getq.h
+
+install: lpd rlpr lpr lpq lprm
+       install -o ${ROOT} -m 6711 lpd ${LIBDIR}/lpd
+       install -o ${DAEMON} -m 6711 rlpr ${LIBDIR}/rlpr
+       install -o ${ROOT} -m 6711 lpr ${BINDIR}/lpr
+       install -o ${ROOT} -m 6711 lpq ${BINDIR}/lpq
+       install -o ${ROOT} -m 6711 lprm ${BINDIR}/lprm
+       chgrp ${SPGRP} ${LIBDIR}/lpd ${LIBDIR}/rlpr ${BINDIR}/lpr \
+               ${BINDIR}/lpq ${BINDIR}/lprm

        chown ${DAEMON} ${SPOOLDIR}
        chown ${DAEMON} ${SPOOLDIR}

+       chgrp ${SPGRP} ${SPOOLDIR}
+       chmod 775 ${SPOOLDIR}

 
 clean:
 
 clean:

-       rm -f laf dq sq lpd lpr necf lpf *.o
+       rm -f lpd rlpr lpr lpq lprm lpdrestart laf lpf necf *.o

 
 print:
        @pr makefile
 
 print:
        @pr makefile