cvs commit: src/etc Makefile

[YONETANI Tomokazu]

On Thu, Jan 13, 2005 at 03:29:40PM -0800, David Rhodus wrote:
>   Remove the old system perl binary when performing 'make upgrade'.
>   
>   This fixes several problems such a 'make index' which traversed the PATH
>   and would use the old system perl.

But if you do it, I need to run `usr.perl port' after every `make upgrade',
making my make.conf bunch of
# -- use.perl generated deltas -- #

Probably the following change will do the job slightly better?

Index: Makefile
===================================================================
RCS file: /home/source/dragonfly/cvs/src/etc/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile
--- Makefile	13 Jan 2005 23:29:40 -0000	1.43
+++ Makefile	14 Jan 2005 01:21:43 -0000
@@ -169,7 +169,8 @@
 	rm -f ${DESTDIR}/usr/sbin/prebind
 	rm -f ${DESTDIR}/modules/checkpt.ko
 	rm -rf ${DESTDIR}/usr/libdata/perl
-	csh -c "rm -f ${DESTDIR}/usr/bin/{find2perl,perl,perl5,perl5.00503,pod2latex}"
+	csh -c "rm -f ${DESTDIR}/usr/bin/{find2perl,perl5,perl5.00503,pod2latex}"
+	test -h ${DESTDIR}/usr/bin/perl || rm -f ${DESTDIR}/usr/bin/perl
 	csh -c "rm -f ${DESTDIR}/usr/bin/{pod2text,sperl5,sperl5.00503,splain,suidperl}"
 .for prog in a2p c2ph h2ph h2xs perlbug perlcc pl2pm pod2html pod2man s2p
 	rm -f ${DESTDIR}/usr/bin/${prog}