9.1-RC1 make buildworld with WITHOUT_LPR NO_LPR not cleaning up properly

[John Baldwin]

On Friday, August 24, 2012 12:47:45 pm David Boyd wrote:
> /etc/make.conf contains NO_LPR=YES
> 
> /etc/src.conf contains WITHOUT_LPR=YES
> 
> make buildworld consistently (9.0 through 9.1-RC1) leaves 
> 
> /usr/share/doc/smm/07.lpd/paper.ascii.gz
> 
> which is then deleted by make delete-old.
> 
> This behaviour was not apparent in 8.x.
> 
> I have systems available to test a fix.

Try this:

Index: share/doc/smm/Makefile
===================================================================
--- Makefile	(revision 239655)
+++ Makefile	(working copy)
@@ -18,7 +18,7 @@ SUBDIR=	title \
 	04.quotas \
 	05.fastfs \
 	06.nfs \
-	07.lpd \
+	${_07.lpd} \
 	${_08.sendmailop} \
 	11.timedop \
 	12.timed \
@@ -28,4 +28,8 @@ SUBDIR=	title \
 _08.sendmailop=	08.sendmailop 
 .endif
 
+.if ${MK_LPR} != "no"
+_07.lpd=	07.lpd
+.endif
+
 .include <bsd.subdir.mk>

-- 
John Baldwin