DragonFly BSD
DragonFly submit List (threaded) for 2005-07
[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]

Re: ln -> ${LN} conversion


From: "Simon 'corecode' Schubert" <corecode@xxxxxxxxxxxx>
Date: Sun, 3 Jul 2005 03:41:14 +0200

Lately "Simon 'corecode' Schubert" <corecode@xxxxxxxxxxxx> said:
> attached patch converts all ln commands in makefiles to ${LN}. this
> takes us one step further to a installworld which registers installed
> files (which in turn will allow us to clean out stale files much more
> easily). please test and comment.

sorry, broken patch, try this one instead.

thans to sascha for noting.

-- 
Serve - BSD     +++  RENT this banner advert  +++    ASCII Ribbon   /"\
Work - Mac      +++  space for low $$$ NOW!1  +++      Campaign     \ /
Party Enjoy Relax   |   http://dragonflybsd.org      Against  HTML   \
Dude 2c 2 the max   !   http://golden-apple.biz       Mail + News   / \
Index: Makefile.inc1
===================================================================
RCS file: /cvs/src/Makefile.inc1,v
retrieving revision 1.71
diff -u -r1.71 Makefile.inc1
--- Makefile.inc1	2 Jun 2005 06:08:07 -0000	1.71
+++ Makefile.inc1	30 Jun 2005 21:45:22 -0000
@@ -305,7 +305,7 @@
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist	\
 		-p ${WORLDDEST}/usr/include > /dev/null
-	ln -sf ${.CURDIR}/sys ${WORLDDEST}
+	${LN} -sf ${.CURDIR}/sys ${WORLDDEST}
 
 _bootstrap-tools:
 	@echo
@@ -767,7 +767,7 @@
 .endif
 
 bootstrap-tools:
-	ln -fs /bin/date ${BTOOLSDEST}/bin/date
+	${LN} -fs /bin/date ${BTOOLSDEST}/bin/date
 .for _tool in ${_strfile} \
     usr.bin/patch \
     bin/chmod bin/cp bin/dd bin/mkdir bin/rm bin/echo bin/test \
Index: bin/csh/Makefile
===================================================================
RCS file: /cvs/src/bin/csh/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- bin/csh/Makefile	10 Mar 2005 14:35:09 -0000	1.6
+++ bin/csh/Makefile	30 Jun 2005 21:19:38 -0000
@@ -77,7 +77,7 @@
 .endfor
 
 csh.1: tcsh.man
-	ln -sf ${.ALLSRC} ${.TARGET}
+	${LN} -sf ${.ALLSRC} ${.TARGET}
 
 build-tools: gethost.nx
 
Index: bin/rmail/Makefile
===================================================================
RCS file: /cvs/src/bin/rmail/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- bin/rmail/Makefile	6 Feb 2005 06:16:40 -0000	1.5
+++ bin/rmail/Makefile	30 Jun 2005 21:19:38 -0000
@@ -43,6 +43,6 @@
 NOSHARED?= NO
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: etc/Makefile
===================================================================
RCS file: /cvs/src/etc/Makefile,v
retrieving revision 1.66
diff -u -r1.66 Makefile
--- etc/Makefile	30 Jun 2005 20:12:13 -0000	1.66
+++ etc/Makefile	30 Jun 2005 21:19:38 -0000
@@ -125,8 +125,8 @@
 .endif
 	rm -f ${DESTDIR}/usr/include/machine/ioctl_meteor.h
 	rm -f ${DESTDIR}/usr/include/machine/ioctl_bt848.h
-	ln -s "../dev/video/bktr/ioctl_bt848.h" ${DESTDIR}/usr/include/machine/ioctl_bt848.h
-	ln -s "../dev/video/meteor/ioctl_meteor.h" ${DESTDIR}/usr/include/machine/ioctl_meteor.h
+	${LN} -s "../dev/video/bktr/ioctl_bt848.h" ${DESTDIR}/usr/include/machine/ioctl_bt848.h
+	${LN} -s "../dev/video/meteor/ioctl_meteor.h" ${DESTDIR}/usr/include/machine/ioctl_meteor.h
 .if exists(${DESTDIR}/usr/sbin/named-checkzone)
 	rm -f ${DESTDIR}/usr/libexec/named-xfer
 	rm -f ${DESTDIR}/usr/bin/dnsquery
@@ -355,8 +355,8 @@
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
 		dot.profile ${DESTDIR}/root/.profile; \
 	    rm -f ${DESTDIR}/.cshrc ${DESTDIR}/.profile; \
-	    ln ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
-	    ln ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+	    ${LN} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc; \
+	    ${LN} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
 	cd ${.CURDIR}/mtree; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${MTREE} ${DESTDIR}/etc/mtree
 	cd ${.CURDIR}/namedb; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
@@ -368,7 +368,7 @@
 	@if [ -d ${DESTDIR}/etc/mail -a -f ${DESTDIR}/etc/mail/aliases -a \
 	      ! -f ${DESTDIR}/etc/aliases ]; then \
 		set -x; \
-		ln -s mail/aliases ${DESTDIR}/etc/aliases; \
+		${LN} -s mail/aliases ${DESTDIR}/etc/aliases; \
 	fi
 	${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
 	    ${DESTDIR}/etc/dumpdates
@@ -426,15 +426,15 @@
 .if !defined(NO_SENDMAIL)
 	mtree -deU -f ${.CURDIR}/mtree/BSD.sendmail.dist -p ${DESTDIR}/
 .endif
-	cd ${DESTDIR}/etc/namedb; rm -f etc/namedb; ln -s ".." etc/namedb
-	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
-	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ln -sf ../man* .
+	cd ${DESTDIR}/etc/namedb; rm -f etc/namedb; ${LN} -s ".." etc/namedb
+	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ${LN} -s usr/src/sys sys
+	cd ${DESTDIR}/usr/share/man/en.ISO8859-1; ${LN} -sf ../man* .
 	cd ${DESTDIR}/usr/share/man; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; \
 	do \
 		rm -rf "$$1"; \
-		ln -s "$$2" "$$1"; \
+		${LN} -s "$$2" "$$1"; \
 		shift; shift; \
 	done
 	cd ${DESTDIR}/usr/share/locale; \
@@ -442,16 +442,16 @@
 	while [ $$# -gt 0 ] ; \
 	do \
 		rm -rf "$$1"; \
-		ln -s "$$2" "$$1"; \
+		${LN} -s "$$2" "$$1"; \
 		shift; shift; \
 	done
-	cd ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1; ln -sf ../man* .
+	cd ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1; ${LN} -sf ../man* .
 	cd ${DESTDIR}/usr/share/nls; \
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; \
 	do \
 		rm -rf "$$1"; \
-		ln -s "$$2" "$$1"; \
+		${LN} -s "$$2" "$$1"; \
 		shift; shift; \
 	done
 
Index: gnu/usr.bin/binutils215/doc/Makefile
===================================================================
RCS file: /cvs/src/gnu/usr.bin/binutils215/doc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- gnu/usr.bin/binutils215/doc/Makefile	4 Jan 2005 14:28:06 -0000	1.2
+++ gnu/usr.bin/binutils215/doc/Makefile	30 Jun 2005 21:19:38 -0000
@@ -26,7 +26,7 @@
 ld.info:	ld.texinfo bfdsumm.texi ldver.texi configdoc.texi
 
 configdoc.texi: gen-doc.texi
-	ln -sf ${.ALLSRC} ${.TARGET}
+	${LN} -sf ${.ALLSRC} ${.TARGET}
 
 .PATH: ${SRCDIR}/binutils/doc
 binutils.info: binutils.texi config.texi
Index: gnu/usr.bin/binutils215/ld/Makefile
===================================================================
RCS file: /cvs/src/gnu/usr.bin/binutils215/ld/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- gnu/usr.bin/binutils215/ld/Makefile	8 May 2005 00:44:59 -0000	1.3
+++ gnu/usr.bin/binutils215/ld/Makefile	30 Jun 2005 21:19:38 -0000
@@ -29,7 +29,7 @@
 CLEANFILES+=	elf-hints.h
 
 elf-hints.h:
-	ln -sf ${.CURDIR}/../../../../include/${.TARGET} .
+	${LN} -sf ${.CURDIR}/../../../../include/${.TARGET} .
 .endif
 
 WARNS=	1
@@ -65,7 +65,7 @@
 	echo "#define EMULATION_LIST ${EMLST} 0" >> ${.TARGET}
 
 stringify.sed:
-	ln -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET}
+	${LN} -sf ${SRCDIR}/ld/emultempl/astring.sed ${.TARGET}
 
 afterinstall:
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
Index: gnu/usr.bin/texinfo/doc/Makefile
===================================================================
RCS file: /cvs/src/gnu/usr.bin/texinfo/doc/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- gnu/usr.bin/texinfo/doc/Makefile	17 Jun 2003 04:25:49 -0000	1.2
+++ gnu/usr.bin/texinfo/doc/Makefile	30 Jun 2005 21:19:38 -0000
@@ -7,6 +7,6 @@
 CLEANFILES=	texinfo.texi
 
 texinfo.texi: texinfo.txi
-	ln -fs ${.ALLSRC} ${.TARGET}
+	${LN} -fs ${.ALLSRC} ${.TARGET}
 
 .include <bsd.info.mk>
Index: include/Makefile
===================================================================
RCS file: /cvs/src/include/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- include/Makefile	21 Apr 2005 16:36:34 -0000	1.24
+++ include/Makefile	30 Jun 2005 21:19:38 -0000
@@ -174,7 +174,7 @@
 		${DESTDIR}/usr/include/i4b_machine
 .endif
 .for i in ${SHDRS}
-	ln -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
+	${LN} -sf ../sys/$i ${DESTDIR}/usr/include/machine/$i
 .endfor
 .for i in ${RMHEADERS}
 	rm -f ${DESTDIR}/usr/include/$i
@@ -184,22 +184,22 @@
 	@${ECHO} "Setting up symlinks to kernel source tree..."
 .for i in ${LDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
-	ln -s ../../sys/$i ${DESTDIR}/usr/include/$i
+	${LN} -s ../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
 	rm -rf ${DESTDIR}/usr/include/crypto
-	ln -s ../../sys/opencrypto ${DESTDIR}/usr/include/crypto
+	${LN} -s ../../sys/opencrypto ${DESTDIR}/usr/include/crypto
 .for i in ${LSYMSUBDIRS}
 	rm -rf ${DESTDIR}/usr/include/$i
-	ln -s ../../../sys/$i ${DESTDIR}/usr/include/$i
+	${LN} -s ../../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
 .for i in ${LSYMSUBDIRS3}
 	rm -rf ${DESTDIR}/usr/include/$i
-	ln -s ../../../../sys/$i ${DESTDIR}/usr/include/$i
+	${LN} -s ../../../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
 	rm -rf ${DESTDIR}/usr/include/machine
-	ln -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
+	${LN} -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
 	rm -rf ${DESTDIR}/usr/include/i4b_machine
-	ln -s ../../sys/net/i4b/include/${MACHINE_ARCH} ${DESTDIR}/usr/include/i4b_machine
+	${LN} -s ../../sys/net/i4b/include/${MACHINE_ARCH} ${DESTDIR}/usr/include/i4b_machine
 
 .include <bsd.prog.mk>
 
Index: lib/libmilter/Makefile
===================================================================
RCS file: /cvs/src/lib/libmilter/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lib/libmilter/Makefile	31 Jan 2004 06:56:39 -0000	1.3
+++ lib/libmilter/Makefile	30 Jun 2005 21:19:38 -0000
@@ -22,6 +22,6 @@
 CLEANFILES+=sm_os.h
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.lib.mk>
Index: lib/libpcap/Makefile
===================================================================
RCS file: /cvs/src/lib/libpcap/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- lib/libpcap/Makefile	21 Apr 2005 13:42:34 -0000	1.7
+++ lib/libpcap/Makefile	30 Jun 2005 21:19:38 -0000
@@ -37,7 +37,7 @@
 		${PCAP_DISTDIR}/VERSION > $@
 
 tokdefs.h: grammar.h
-	ln -sf grammar.h tokdefs.h
+	${LN} -sf grammar.h tokdefs.h
 
 #
 # Apply patches
Index: lib/libsm/Makefile
===================================================================
RCS file: /cvs/src/lib/libsm/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- lib/libsm/Makefile	23 Jul 2004 18:15:08 -0000	1.6
+++ lib/libsm/Makefile	30 Jun 2005 21:19:38 -0000
@@ -32,6 +32,6 @@
 INTERNALLIB=		true
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.lib.mk>
Index: lib/libsmdb/Makefile
===================================================================
RCS file: /cvs/src/lib/libsmdb/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lib/libsmdb/Makefile	31 Jan 2004 06:56:39 -0000	1.3
+++ lib/libsmdb/Makefile	30 Jun 2005 21:19:38 -0000
@@ -19,6 +19,6 @@
 INTERNALLIB=		true
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.lib.mk>
Index: lib/libsmutil/Makefile
===================================================================
RCS file: /cvs/src/lib/libsmutil/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- lib/libsmutil/Makefile	31 Jan 2004 06:56:39 -0000	1.3
+++ lib/libsmutil/Makefile	30 Jun 2005 21:19:38 -0000
@@ -19,6 +19,6 @@
 INTERNALLIB=		true
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.lib.mk>
Index: libexec/lukemftpd/Makefile
===================================================================
RCS file: /cvs/src/libexec/lukemftpd/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libexec/lukemftpd/Makefile	31 Jan 2004 06:56:40 -0000	1.3
+++ libexec/lukemftpd/Makefile	30 Jun 2005 21:19:38 -0000
@@ -42,7 +42,7 @@
 ftpd.o ftpcmd.o: version.h
 
 lukemftpd.8: ftpd.8
-	ln -sf ${.ALLSRC} ${.TARGET}
+	${LN} -sf ${.ALLSRC} ${.TARGET}
 
 CLEANFILES+= lukemftpd.8
 
Index: libexec/mail.local/Makefile
===================================================================
RCS file: /cvs/src/libexec/mail.local/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libexec/mail.local/Makefile	31 Jan 2004 06:56:40 -0000	1.3
+++ libexec/mail.local/Makefile	30 Jun 2005 21:19:38 -0000
@@ -30,6 +30,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: libexec/smrsh/Makefile
===================================================================
RCS file: /cvs/src/libexec/smrsh/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- libexec/smrsh/Makefile	31 Jan 2004 06:56:40 -0000	1.3
+++ libexec/smrsh/Makefile	30 Jun 2005 21:19:38 -0000
@@ -30,6 +30,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: nrelease/Makefile
===================================================================
RCS file: /cvs/src/nrelease/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- nrelease/Makefile	29 Jun 2005 17:24:35 -0000	1.35
+++ nrelease/Makefile	30 Jun 2005 21:19:38 -0000
@@ -136,7 +136,7 @@
 	cpdup ${ISOROOT}/etc ${ISOROOT}/etc.hdd
 	( cd ${.CURDIR}/..; make DESTDIR=${ISOROOT} \
 		installkernel KERNCONF=${KERNCONF} )
-	ln -s kernel ${ISOROOT}/kernel.BOOTP
+	${LN} -s kernel ${ISOROOT}/kernel.BOOTP
 	mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.local.dist -p ${ISOROOT}/usr/local/
 	mtree -deU -f ${.CURDIR}/../etc/mtree/BSD.var.dist -p ${ISOROOT}/var
 	dev_mkdb -f ${ISOROOT}/var/run/dev.db ${ISOROOT}/dev
Index: sbin/rcorder/Makefile
===================================================================
RCS file: /cvs/src/sbin/rcorder/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- sbin/rcorder/Makefile	1 Dec 2004 19:44:53 -0000	1.2
+++ sbin/rcorder/Makefile	30 Jun 2005 21:19:38 -0000
@@ -17,6 +17,6 @@
 CLEANFILES+=	util.h
 
 util.h:
-	ln -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET}
+	${LN} -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET}
 
 .include <bsd.prog.mk>
Index: share/colldef/Makefile
===================================================================
RCS file: /cvs/src/share/colldef/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- share/colldef/Makefile	27 Sep 2004 19:30:50 -0000	1.4
+++ share/colldef/Makefile	30 Jun 2005 21:19:38 -0000
@@ -95,35 +95,35 @@
 		${locale}.out ${LOCALEDIR}/${locale}/LC_COLLATE
 .endfor
 .for link in ${ASCIILINKS}
-	ln -fs ../la_LN.US-ASCII/LC_COLLATE \
+	${LN} -fs ../la_LN.US-ASCII/LC_COLLATE \
 	       ${LOCALEDIR}/${link}/LC_COLLATE
 .endfor
 .for link in ${ZHLINKS}
-	ln -fs ../is_IS.ISO8859-1/LC_COLLATE \
+	${LN} -fs ../is_IS.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}/LC_COLLATE
 .endfor
 .for link in ${LATIN1LINKS}
-	ln -fs ../la_LN.ISO8859-1/LC_COLLATE \
+	${LN} -fs ../la_LN.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
-	ln -fs ../la_LN.ISO8859-15/LC_COLLATE \
+	${LN} -fs ../la_LN.ISO8859-15/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
 .for link in ${LATIN2LINKS}
-	ln -fs ../la_LN.ISO8859-2/LC_COLLATE \
+	${LN} -fs ../la_LN.ISO8859-2/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-2/LC_COLLATE
 .endfor
 .for link in ${DELINKS}
-	ln -fs ../de_DE.ISO8859-1/LC_COLLATE \
+	${LN} -fs ../de_DE.ISO8859-1/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-1/LC_COLLATE
-	ln -fs ../de_DE.ISO8859-15/LC_COLLATE \
+	${LN} -fs ../de_DE.ISO8859-15/LC_COLLATE \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_COLLATE
 .endfor
-	ln -fs ../cs_CZ.ISO8859-2/LC_COLLATE \
+	${LN} -fs ../cs_CZ.ISO8859-2/LC_COLLATE \
 	       ${LOCALEDIR}/sk_SK.ISO8859-2/LC_COLLATE
-	ln -fs ../pt_PT.ISO8859-1/LC_COLLATE \
+	${LN} -fs ../pt_PT.ISO8859-1/LC_COLLATE \
 		${LOCALEDIR}/pt_BR.ISO8859-1/LC_COLLATE
 .for link in ${UTF8LINKS}
-	ln -fs ../la_LN.UTF-8/LC_COLLATE \
+	${LN} -fs ../la_LN.UTF-8/LC_COLLATE \
 		${LOCALEDIR}/${link}.UTF-8/LC_COLLATE
 .endfor
 
Index: share/examples/Makefile
===================================================================
RCS file: /cvs/src/share/examples/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- share/examples/Makefile	17 Jun 2003 04:36:57 -0000	1.2
+++ share/examples/Makefile	30 Jun 2005 21:19:38 -0000
@@ -33,7 +33,7 @@
 
 .for dir in ${DIRS}
 symlinks::
-	rm -rf ${DDIR}/${dir}; ln -s ${.CURDIR}/${dir} ${DDIR}
+	rm -rf ${DDIR}/${dir}; ${LN} -s ${.CURDIR}/${dir} ${DDIR}
 .endfor
 
 etc-examples:
Index: share/mk/bsd.incs.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.incs.mk,v
retrieving revision 1.5
diff -u -r1.5 bsd.incs.mk
--- share/mk/bsd.incs.mk	12 Apr 2005 23:35:37 -0000	1.5
+++ share/mk/bsd.incs.mk	30 Jun 2005 21:19:38 -0000
@@ -72,7 +72,7 @@
 		t=${DESTDIR}$$1; \
 		shift; \
 		${ECHO} $$t -\> $$l; \
-		ln -fhs $$l $$t; \
+		${LN} -fhs $$l $$t; \
 	done; true
 .endif
 .endif # !target(installincludes)
Index: share/mk/bsd.info.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.info.mk,v
retrieving revision 1.5
diff -u -r1.5 bsd.info.mk
--- share/mk/bsd.info.mk	6 Jan 2005 14:54:57 -0000	1.5
+++ share/mk/bsd.info.mk	30 Jun 2005 21:19:38 -0000
@@ -122,7 +122,7 @@
 
 .info.html:
 	${INFO2HTML} ${.IMPSRC}
-	ln -f ${.TARGET:R}.info.Top.html ${.TARGET} 
+	${LN} -f ${.TARGET:R}.info.Top.html ${.TARGET} 
 
 .PATH: ${.CURDIR} ${SRCDIR}
 
Index: share/mk/bsd.lib.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.lib.mk,v
retrieving revision 1.11
diff -u -r1.11 bsd.lib.mk
--- share/mk/bsd.lib.mk	29 Apr 2005 21:25:09 -0000	1.11
+++ share/mk/bsd.lib.mk	30 Jun 2005 21:19:38 -0000
@@ -188,7 +188,7 @@
 	@${ECHO} building shared library ${SHLIB_NAME}
 	rm -f ${.TARGET} ${SHLIB_LINK}
 .if defined(SHLIB_LINK)
-	ln -fs ${.TARGET} ${SHLIB_LINK}
+	${LN} -fs ${.TARGET} ${SHLIB_LINK}
 .endif
 	${CC} ${LDFLAGS} -shared -Wl,-x \
 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
@@ -254,7 +254,7 @@
 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
 	    ${SHLIB_NAME} ${DESTDIR}${USESHLIBDIR}
 .if defined(SHLIB_LINK)
-	ln -fs ${SHLIB_NAME} ${DESTDIR}${USESHLIBDIR}/${SHLIB_LINK}
+	${LN} -fs ${SHLIB_NAME} ${DESTDIR}${USESHLIBDIR}/${SHLIB_LINK}
 .endif
 .endif
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
Index: share/mk/bsd.links.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.links.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.links.mk
--- share/mk/bsd.links.mk	17 Jun 2003 04:37:02 -0000	1.2
+++ share/mk/bsd.links.mk	30 Jun 2005 21:19:38 -0000
@@ -16,7 +16,7 @@
 		t=${DESTDIR}$$1; \
 		shift; \
 		${ECHO} $$t -\> $$l; \
-		ln -f $$l $$t; \
+		${LN} -f $$l $$t; \
 	done; true
 .endif
 .if defined(SYMLINKS) && !empty(SYMLINKS)
@@ -27,6 +27,6 @@
 		t=${DESTDIR}$$1; \
 		shift; \
 		${ECHO} $$t -\> $$l; \
-		ln -fs $$l $$t; \
+		${LN} -fs $$l $$t; \
 	done; true
 .endif
Index: share/mk/bsd.man.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.man.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.man.mk
--- share/mk/bsd.man.mk	17 Jun 2003 04:37:02 -0000	1.2
+++ share/mk/bsd.man.mk	30 Jun 2005 21:19:38 -0000
@@ -217,7 +217,7 @@
 		t=${DESTDIR}${MANDIR}$${sect}${MANSUBDIR}/$$name; \
 		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
 		rm -f $${t} $${t}${MCOMPRESS_EXT}; \
-		ln $${l}${ZEXT} $${t}${ZEXT}; \
+		${LN} $${l}${ZEXT} $${t}${ZEXT}; \
 	done
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 	@set `echo ${MLINKS} " " | sed 's/\.\([^.]*\) /.\1 \1 /g'`; \
@@ -232,7 +232,7 @@
 		t=${DESTDIR}${CATDIR}$${sect}${MANSUBDIR}/$$name; \
 		${ECHO} $${t}${ZEXT} -\> $${l}${ZEXT}; \
 		rm -f $${t} $${t}${MCOMPRESS_EXT}; \
-		ln $${l}${ZEXT} $${t}${ZEXT}; \
+		${LN} $${l}${ZEXT} $${t}${ZEXT}; \
 	done
 .endif
 .endif
Index: share/mk/bsd.obj.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.obj.mk,v
retrieving revision 1.3
diff -u -r1.3 bsd.obj.mk
--- share/mk/bsd.obj.mk	12 Apr 2005 23:35:37 -0000	1.3
+++ share/mk/bsd.obj.mk	30 Jun 2005 21:19:38 -0000
@@ -94,7 +94,7 @@
 objlink:
 	@if test -d ${CANONICALOBJDIR}/; then \
 		rm -f ${.CURDIR}/obj; \
-		ln -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \
+		${LN} -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \
 	else \
 		echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \
 	fi
Index: share/mk/bsd.prog.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.prog.mk,v
retrieving revision 1.8
diff -u -r1.8 bsd.prog.mk
--- share/mk/bsd.prog.mk	12 Apr 2005 23:35:37 -0000	1.8
+++ share/mk/bsd.prog.mk	30 Jun 2005 21:19:38 -0000
@@ -120,7 +120,7 @@
 .endif
 .endif
 .if defined(HIDEGAME)
-	(cd ${DESTDIR}${ORIGBINDIR}; ln -fs dm ${PROG}; \
+	(cd ${DESTDIR}${ORIGBINDIR}; ${LN} -fs dm ${PROG}; \
 	    chown -h ${BINOWN}:${ORIGBINGRP} ${PROG})
 .endif
 .endif # !target(realinstall)
Index: share/mk/sys.mk
===================================================================
RCS file: /cvs/src/share/mk/sys.mk,v
retrieving revision 1.13
diff -u -r1.13 sys.mk
--- share/mk/sys.mk	5 Jun 2005 19:23:10 -0000	1.13
+++ share/mk/sys.mk	30 Jun 2005 21:50:53 -0000
@@ -76,6 +76,7 @@
 EFLAGS		?=
 
 INSTALL		?=	install
+LN		?=	ln
 
 LEX		?=	lex
 LFLAGS		?=
Index: share/monetdef/Makefile
===================================================================
RCS file: /cvs/src/share/monetdef/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- share/monetdef/Makefile	7 Oct 2004 13:32:37 -0000	1.7
+++ share/monetdef/Makefile	30 Jun 2005 21:19:38 -0000
@@ -98,52 +98,52 @@
 		${LOCALEDIR}/${lang}/LC_MONETARY
 .endfor
 .for link in ${LATIN15LINKS}
-	ln -sf ../${link}.ISO8859-1/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-1/LC_MONETARY \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_MONETARY
 .endfor
 .for link in ${ASCIILINKS}
-	ln -sf ../${link}.ISO8859-1/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-1/LC_MONETARY \
 		${LOCALEDIR}/${link}.US-ASCII/LC_MONETARY
 .endfor
 .for link in ${CH_LINKS}
-	ln -sf ../${CH_SRC}.ISO8859-1/LC_MONETARY \
+	${LN} -sf ../${CH_SRC}.ISO8859-1/LC_MONETARY \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MONETARY
 .endfor
-	ln -sf ../ja_JP.eucJP/LC_MONETARY \
+	${LN} -sf ../ja_JP.eucJP/LC_MONETARY \
 		${LOCALEDIR}/ja_JP.SJIS/LC_MONETARY
 .for link in ${UTF8_LATIN1LINKS}
-	ln -sf ../${link}.ISO8859-1/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-1/LC_MONETARY \
                 ${LOCALEDIR}/${link}.UTF-8/LC_MONETARY
 .endfor
 .for link in ${UTF8_LATIN2LINKS}
-	ln -sf ../${link}.ISO8859-2/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-2/LC_MONETARY \
 		${LOCALEDIR}/${link}.UTF-8/LC_MONETARY
 .endfor
 .for link in ${UTF8_LATIN7LINKS}
-	ln -sf ../${link}.ISO8859-7/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-7/LC_MONETARY \
 		${LOCALEDIR}/${link}.UTF-8/LC_MONETARY
 .endfor
 .for link in ${UTF8_LATIN9LINKS}
-	ln -sf ../${link}.ISO8859-9/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-9/LC_MONETARY \
 		${LOCALEDIR}/${link}.UTF-8/LC_MONETARY
 .endfor
 .for link in ${UTF8_LATIN13LINKS}
-	ln -sf ../${link}.ISO8859-13/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-13/LC_MONETARY \
 		${LOCALEDIR}/${link}.UTF-8/LC_MONETARY
 .endfor
 .for link in ${UTF8_LATIN15LINKS}
-	ln -sf ../${link}.ISO8859-15/LC_MONETARY \
+	${LN} -sf ../${link}.ISO8859-15/LC_MONETARY \
 		${LOCALEDIR}/${link}.UTF-8/LC_MONETARY
 .endfor
 .for link in ${CH_LINKS}
-	ln -sf ../${CH_SRC}.UTF-8/LC_MONETARY \
+	${LN} -sf ../${CH_SRC}.UTF-8/LC_MONETARY \
 		${LOCALEDIR}/${link}.UTF-8/LC_MONETARY
 .endfor
-	ln -sf ../ja_JP.eucJP/LC_MONETARY \
+	${LN} -sf ../ja_JP.eucJP/LC_MONETARY \
 		${LOCALEDIR}/ja_JP.UTF-8/LC_MONETARY
-	ln -sf ../ko_KR.eucKR/LC_MONETARY \
+	${LN} -sf ../ko_KR.eucKR/LC_MONETARY \
 		${LOCALEDIR}/ko_KR.UTF-8/LC_MONETARY
-	ln -sf ../zh_TW.Big5/LC_MONETARY \
+	${LN} -sf ../zh_TW.Big5/LC_MONETARY \
 		${LOCALEDIR}/zh_TW.UTF-8/LC_MONETARY
 
 .include <bsd.prog.mk>
Index: share/msgdef/Makefile
===================================================================
RCS file: /cvs/src/share/msgdef/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- share/msgdef/Makefile	28 Sep 2004 16:30:13 -0000	1.5
+++ share/msgdef/Makefile	30 Jun 2005 21:19:38 -0000
@@ -92,104 +92,104 @@
 			   ${LOCALEDIR}/${lang}/LC_MESSAGES
 .endfor
 .for link in ${LATIN15LINKS}
-	ln -sf ../${link}.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../${link}.ISO8859-1/LC_MESSAGES \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
 .endfor
 .for link in ${GB_LINKS}
-	ln -sf ../en_GB.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../en_GB.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../en_GB.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../en_GB.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
-	ln -sf ../en_GB.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../en_GB.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.US-ASCII/LC_MESSAGES
 .endfor
 .for link in ${FR_LINKS}
-	ln -sf ../fr_FR.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../fr_FR.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../fr_FR.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../fr_FR.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
 .endfor
 .for link in ${DE_LINKS}
-	ln -sf ../de_DE.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../de_DE.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../de_DE.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../de_DE.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
 .endfor
 .for link in ${IT_LINKS}
-	ln -sf ../it_IT.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../it_IT.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../it_IT.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../it_IT.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
 .endfor
 .for link in ${NL_LINKS}
-	ln -sf ../nl_NL.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../nl_NL.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
-	ln -sf ../nl_NL.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../nl_NL.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_MESSAGES
 .endfor
 .for link in ${CZ_LINKS}
-	ln -sf ../cs_CZ.ISO8859-2/LC_MESSAGES \
+	${LN} -sf ../cs_CZ.ISO8859-2/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-2/LC_MESSAGES
 .endfor
 .for link in ${PT_LINKS}
-	ln -sf ../pt_PT.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../pt_PT.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_MESSAGES
 .endfor
 .for link in ${ASCIILINKS}
-	ln -sf ../${link}.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../${link}.ISO8859-1/LC_MESSAGES \
 		${LOCALEDIR}/${link}.US-ASCII/LC_MESSAGES
 .endfor
 .for link in ${UTF8_LATIN1LINKS}
-	ln -sf ../${link}.ISO8859-1/LC_MESSAGES \
+	${LN} -sf ../${link}.ISO8859-1/LC_MESSAGES \
                ${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${UTF8_LATIN2LINKS}
-	ln -sf ../${link}.ISO8859-2/LC_MESSAGES \
+	${LN} -sf ../${link}.ISO8859-2/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${UTF8_LATIN9LINKS}
-	ln -sf ../${link}.ISO8859-9/LC_MESSAGES \
+	${LN} -sf ../${link}.ISO8859-9/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${UTF8_LATIN13LINKS}
-	ln -sf ../${link}.ISO8859-13/LC_MESSAGES \
+	${LN} -sf ../${link}.ISO8859-13/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${UTF8_LATIN15LINKS}
-	ln -sf ../${link}.ISO8859-15/LC_MESSAGES \
+	${LN} -sf ../${link}.ISO8859-15/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${GB_LINKS}
-	ln -sf ../en_GB.UTF-8/LC_MESSAGES \
+	${LN} -sf ../en_GB.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${FR_LINKS}
-	ln -sf ../fr_FR.UTF-8/LC_MESSAGES \
+	${LN} -sf ../fr_FR.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${DE_LINKS}
-	ln -sf ../de_DE.UTF-8/LC_MESSAGES \
+	${LN} -sf ../de_DE.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${IT_LINKS}
-	ln -sf ../it_IT.UTF-8/LC_MESSAGES \
+	${LN} -sf ../it_IT.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${NL_LINKS}
-	ln -sf ../nl_NL.UTF-8/LC_MESSAGES \
+	${LN} -sf ../nl_NL.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${CZ_LINKS}
-	ln -sf ../cs_CZ.UTF-8/LC_MESSAGES \
+	${LN} -sf ../cs_CZ.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
 .for link in ${PT_LINKS}
-	ln -sf ../pt_PT.UTF-8/LC_MESSAGES \
+	${LN} -sf ../pt_PT.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/${link}.UTF-8/LC_MESSAGES
 .endfor
-	ln -sf ../ko_KR.eucKR/LC_MESSAGES \
+	${LN} -sf ../ko_KR.eucKR/LC_MESSAGES \
 		${LOCALEDIR}/ko_KR.UTF-8/LC_MESSAGES
-	ln -sf ../zh_TW.UTF-8/LC_MESSAGES \
+	${LN} -sf ../zh_TW.UTF-8/LC_MESSAGES \
 		${LOCALEDIR}/zh_HK.UTF-8/LC_MESSAGES
 
 .include <bsd.prog.mk>
Index: share/numericdef/Makefile
===================================================================
RCS file: /cvs/src/share/numericdef/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- share/numericdef/Makefile	28 Sep 2004 16:30:13 -0000	1.6
+++ share/numericdef/Makefile	30 Jun 2005 21:19:38 -0000
@@ -80,128 +80,128 @@
 			   ${LOCALEDIR}/${lang}/LC_NUMERIC
 .endfor
 .for link in ${LATIN15LINKS}
-	ln -sf ../${link}.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-1/LC_NUMERIC \
 	       ${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
 .for link in ${US_LINKS}
-	ln -sf ../en_US.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../en_US.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../en_US.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../en_US.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
-	ln -sf ../en_US.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../en_US.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.US-ASCII/LC_NUMERIC
 .for link in ${GB_LINKS}
-	ln -sf ../en_GB.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../en_GB.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../en_GB.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../en_GB.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
-	ln -sf ../en_GB.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../en_GB.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.US-ASCII/LC_NUMERIC
 .endfor
 .for link in ${FR_LINKS}
-	ln -sf ../fr_FR.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../fr_FR.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../fr_FR.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../fr_FR.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
 .for link in ${DE_LINKS}
-	ln -sf ../de_DE.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../de_DE.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../de_DE.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../de_DE.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
 .for link in ${IT_LINKS}
-	ln -sf ../it_IT.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../it_IT.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../it_IT.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../it_IT.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
 .for link in ${BE_LINKS}
-	ln -sf ../fr_BE.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../fr_BE.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-1/LC_NUMERIC
-	ln -sf ../fr_BE.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../fr_BE.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
 .endfor
 .for link in ${ASCIILINKS}
-	ln -sf ../${link}.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.US-ASCII/LC_NUMERIC
 .endfor
-	ln -sf ../ja_JP.eucJP/LC_NUMERIC \
+	${LN} -sf ../ja_JP.eucJP/LC_NUMERIC \
 		${LOCALEDIR}/ja_JP.SJIS/LC_NUMERIC
 .for link in ${UTF8_LATIN1LINKS}
-	ln -sf ../${link}.ISO8859-1/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-1/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${UTF8_LATIN2LINKS}
-	ln -sf ../${link}.ISO8859-2/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-2/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${UTF8_LATIN5LINKS}
-	ln -sf ../${link}.ISO8859-5/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-5/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${UTF8_LATIN7LINKS}
-	ln -sf ../${link}.ISO8859-7/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-7/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${UTF8_LATIN9LINKS}
-	ln -sf ../${link}.ISO8859-9/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-9/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${UTF8_LATIN13LINKS}
-	ln -sf ../${link}.ISO8859-13/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-13/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${UTF8_LATIN15LINKS}
-	ln -sf ../${link}.ISO8859-15/LC_NUMERIC \
+	${LN} -sf ../${link}.ISO8859-15/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${UTF8_ARMSCII8LINKS}
-	ln -sf ../${link}.ARMSCII-8/LC_NUMERIC \
+	${LN} -sf ../${link}.ARMSCII-8/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${US_LINKS}
-	ln -sf ../en_US.UTF-8/LC_NUMERIC \
+	${LN} -sf ../en_US.UTF-8/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${GB_LINKS}
-	ln -sf ../en_GB.UTF-8/LC_NUMERIC \
+	${LN} -sf ../en_GB.UTF-8/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${FR_LINKS}
-	ln -sf ../fr_FR.UTF-8/LC_NUMERIC \
+	${LN} -sf ../fr_FR.UTF-8/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${DE_LINKS}
-	ln -sf ../de_DE.UTF-8/LC_NUMERIC \
+	${LN} -sf ../de_DE.UTF-8/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${IT_LINKS}
-	ln -sf ../it_IT.UTF-8/LC_NUMERIC \
+	${LN} -sf ../it_IT.UTF-8/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
 .for link in ${BE_LINKS}
-	ln -sf ../fr_BE.UTF-8/LC_NUMERIC \
+	${LN} -sf ../fr_BE.UTF-8/LC_NUMERIC \
 		${LOCALEDIR}/${link}.UTF-8/LC_NUMERIC
 .endfor
-	ln -sf ../be_BY.CP1251/LC_NUMERIC \
+	${LN} -sf ../be_BY.CP1251/LC_NUMERIC \
 		${LOCALEDIR}/be_BY.UTF-8/LC_NUMERIC
-	ln -sf ../bg_BG.CP1251/LC_NUMERIC \
+	${LN} -sf ../bg_BG.CP1251/LC_NUMERIC \
 		${LOCALEDIR}/bg_BG.UTF-8/LC_NUMERIC
-	ln -sf ../ja_JP.eucJP/LC_NUMERIC \
+	${LN} -sf ../ja_JP.eucJP/LC_NUMERIC \
 		${LOCALEDIR}/ja_JP.UTF-8/LC_NUMERIC
-	ln -sf ../kk_KZ.PT154/LC_NUMERIC \
+	${LN} -sf ../kk_KZ.PT154/LC_NUMERIC \
 		${LOCALEDIR}/kk_KZ.UTF-8/LC_NUMERIC
-	ln -sf ../ko_KR.eucKR/LC_NUMERIC \
+	${LN} -sf ../ko_KR.eucKR/LC_NUMERIC \
 		${LOCALEDIR}/ko_KR.UTF-8/LC_NUMERIC
-	ln -sf ../ru_RU.CP866/LC_NUMERIC \
+	${LN} -sf ../ru_RU.CP866/LC_NUMERIC \
 		${LOCALEDIR}/ru_RU.UTF-8/LC_NUMERIC
-	ln -sf ../zh_CN.eucCN/LC_NUMERIC \
+	${LN} -sf ../zh_CN.eucCN/LC_NUMERIC \
 		${LOCALEDIR}/zh_CN.UTF-8/LC_NUMERIC
-	ln -sf ../zh_TW.Big5/LC_NUMERIC \
+	${LN} -sf ../zh_TW.Big5/LC_NUMERIC \
 		${LOCALEDIR}/zh_HK.UTF-8/LC_NUMERIC
-	ln -sf ../zh_TW.Big5/LC_NUMERIC \
+	${LN} -sf ../zh_TW.Big5/LC_NUMERIC \
 		${LOCALEDIR}/zh_TW.UTF-8/LC_NUMERIC
 
 .include <bsd.prog.mk>
Index: share/sendmail/Makefile
===================================================================
RCS file: /cvs/src/share/sendmail/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- share/sendmail/Makefile	31 Jan 2004 06:56:41 -0000	1.3
+++ share/sendmail/Makefile	30 Jun 2005 21:19:38 -0000
@@ -30,6 +30,6 @@
 .endfor
 
 symlinks::
-	rm -rf ${DDIR}/${CFDIR}; ln -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR}
+	rm -rf ${DDIR}/${CFDIR}; ${LN} -s ${SENDMAIL_DIR}/${CFDIR} ${DDIR}/${CFDIR}
 
 .include <bsd.prog.mk>
Index: share/termcap/Makefile
===================================================================
RCS file: /cvs/src/share/termcap/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- share/termcap/Makefile	17 Jun 2003 04:37:03 -0000	1.2
+++ share/termcap/Makefile	30 Jun 2005 21:19:38 -0000
@@ -19,6 +19,6 @@
 	cap_mkdb termcap
 
 etc-termcap:
-	ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
+	${LN} -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
 
 .include <bsd.prog.mk>
Index: share/timedef/Makefile
===================================================================
RCS file: /cvs/src/share/timedef/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- share/timedef/Makefile	27 Sep 2004 14:44:33 -0000	1.5
+++ share/timedef/Makefile	30 Jun 2005 21:19:38 -0000
@@ -107,100 +107,100 @@
 			   ${LOCALEDIR}/$$l/LC_TIME; \
 	done
 	for l in ${LATIN15LINKS}; do \
-		ln -fs ../$$l.ISO8859-1/LC_TIME \
+		${LN} -fs ../$$l.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${DE_LINKS}; do \
-		ln -fs ../de_DE.ISO8859-1/LC_TIME \
+		${LN} -fs ../de_DE.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
-		ln -fs ../de_DE.ISO8859-1/LC_TIME \
+		${LN} -fs ../de_DE.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${IT_LINKS}; do \
-		ln -fs ../it_IT.ISO8859-1/LC_TIME \
+		${LN} -fs ../it_IT.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
-		ln -fs ../it_IT.ISO8859-1/LC_TIME \
+		${LN} -fs ../it_IT.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${FR_LINKS}; do \
-		ln -fs ../fr_FR.ISO8859-1/LC_TIME \
+		${LN} -fs ../fr_FR.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
-		ln -fs ../fr_FR.ISO8859-1/LC_TIME \
+		${LN} -fs ../fr_FR.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${LN_LINKS}; do \
-		ln -fs ../la_LN.ISO8859-1/LC_TIME \
+		${LN} -fs ../la_LN.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l/LC_TIME; \
 	done
 	for l in ${NL_LINKS}; do \
-		ln -fs ../nl_NL.ISO8859-1/LC_TIME \
+		${LN} -fs ../nl_NL.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
-		ln -fs ../nl_NL.ISO8859-1/LC_TIME \
+		${LN} -fs ../nl_NL.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
 	done
 	for l in ${US_LINKS}; do \
-		ln -fs ../en_US.ISO8859-1/LC_TIME \
+		${LN} -fs ../en_US.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
-		ln -fs ../en_US.ISO8859-1/LC_TIME \
+		${LN} -fs ../en_US.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
-		ln -fs ../en_US.ISO8859-1/LC_TIME \
+		${LN} -fs ../en_US.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.US-ASCII/LC_TIME; \
 	done
 	for l in ${GB_LINKS}; do \
-		ln -fs ../en_GB.ISO8859-1/LC_TIME \
+		${LN} -fs ../en_GB.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-1/LC_TIME; \
-		ln -fs ../en_GB.ISO8859-1/LC_TIME \
+		${LN} -fs ../en_GB.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.ISO8859-15/LC_TIME; \
-		ln -fs ../en_GB.ISO8859-1/LC_TIME \
+		${LN} -fs ../en_GB.ISO8859-1/LC_TIME \
 		       ${LOCALEDIR}/$$l.US-ASCII/LC_TIME; \
 	done
-	ln -fs ../en_GB.ISO8859-1/LC_TIME \
+	${LN} -fs ../en_GB.ISO8859-1/LC_TIME \
 	       ${LOCALEDIR}/en_GB.US-ASCII/LC_TIME
-	ln -fs ../en_US.ISO8859-1/LC_TIME \
+	${LN} -fs ../en_US.ISO8859-1/LC_TIME \
 	       ${LOCALEDIR}/en_US.US-ASCII/LC_TIME
-	ln -fs ../en_US.ISO8859-1/LC_TIME \
+	${LN} -fs ../en_US.ISO8859-1/LC_TIME \
 	       ${LOCALEDIR}/af_ZA.ISO8859-1/LC_TIME
-	ln -fs ../en_US.ISO8859-15/LC_TIME \
+	${LN} -fs ../en_US.ISO8859-15/LC_TIME \
 	       ${LOCALEDIR}/af_ZA.ISO8859-15/LC_TIME
-	ln -fs ../ko_KR.eucKR/LC_TIME \
+	${LN} -fs ../ko_KR.eucKR/LC_TIME \
 	       ${LOCALEDIR}/ko_KR.CP949/LC_TIME
-	ln -fs ../zh_CN.GB2312/LC_TIME \
+	${LN} -fs ../zh_CN.GB2312/LC_TIME \
 	       ${LOCALEDIR}/zh_CN.GBK/LC_TIME
 	for l in ${UTF8_LATIN1LINKS}; do \
-	       ln -fs ../$$l.ISO8859-1/LC_TIME \
+	       ${LN} -fs ../$$l.ISO8859-1/LC_TIME \
 	             ${LOCALEDIR}/$$l.UTF-8/LC_TIME; \
 	done
 	for l in ${DE_LINKS}; do \
-	       ln -fs ../de_DE.UTF-8/LC_TIME \
+	       ${LN} -fs ../de_DE.UTF-8/LC_TIME \
 	              ${LOCALEDIR}/$$l.UTF-8/LC_TIME; \
 	done
 	for l in ${IT_LINKS}; do \
-	       ln -fs ../it_IT.UTF-8/LC_TIME \
+	       ${LN} -fs ../it_IT.UTF-8/LC_TIME \
 	              ${LOCALEDIR}/$$l.UTF-8/LC_TIME; \
 	done
 	for l in ${FR_LINKS}; do \
-	       ln -fs ../fr_FR.UTF-8/LC_TIME \
+	       ${LN} -fs ../fr_FR.UTF-8/LC_TIME \
 	              ${LOCALEDIR}/$$l.UTF-8/LC_TIME; \
 	done
 	for l in ${NL_LINKS}; do \
-	       ln -fs ../nl_NL.UTF-8/LC_TIME \
+	       ${LN} -fs ../nl_NL.UTF-8/LC_TIME \
 	              ${LOCALEDIR}/$$l.UTF-8/LC_TIME; \
 	done
 	for l in ${US_LINKS}; do \
-	       ln -fs ../en_US.UTF-8/LC_TIME \
+	       ${LN} -fs ../en_US.UTF-8/LC_TIME \
 	              ${LOCALEDIR}/$$l.UTF-8/LC_TIME; \
 	done
 	for l in ${GB_LINKS}; do \
-	       ln -fs ../en_GB.UTF-8/LC_TIME \
+	       ${LN} -fs ../en_GB.UTF-8/LC_TIME \
 	              ${LOCALEDIR}/$$l.UTF-8/LC_TIME; \
 	done
-	ln -fs ../en_GB.UTF-8/LC_TIME \
+	${LN} -fs ../en_GB.UTF-8/LC_TIME \
 	       ${LOCALEDIR}/en_IE.UTF-8/LC_TIME
-	ln -fs ../en_US.UTF-8/LC_TIME \
+	${LN} -fs ../en_US.UTF-8/LC_TIME \
 	       ${LOCALEDIR}/af_ZA.UTF-8/LC_TIME
-	ln -fs ../zh_TW.UTF-8/LC_TIME \
+	${LN} -fs ../zh_TW.UTF-8/LC_TIME \
 	       ${LOCALEDIR}/zh_HK.UTF-8/LC_TIME
-	ln -fs ../zh_TW.UTF-8/LC_TIME \
+	${LN} -fs ../zh_TW.UTF-8/LC_TIME \
 	       ${LOCALEDIR}/zh_HK.Big5HKSCS/LC_TIME
 
 .include <bsd.prog.mk>
Index: sys/boot/efi/libefi/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/efi/libefi/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/boot/efi/libefi/Makefile	10 Nov 2003 06:08:32 -0000	1.1
+++ sys/boot/efi/libefi/Makefile	30 Jun 2005 21:19:38 -0000
@@ -31,7 +31,7 @@
 .endif
 
 machine:
-	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
+	${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
 CLEANFILES+=	machine
 
Index: sys/boot/efi/loader/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/efi/loader/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/boot/efi/loader/Makefile	10 Nov 2003 06:08:33 -0000	1.1
+++ sys/boot/efi/loader/Makefile	30 Jun 2005 21:19:38 -0000
@@ -113,7 +113,7 @@
 	${CC} -c ${CFLAGS} ${.IMPSRC}
 
 machine:
-	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
+	${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
 .include <bsd.prog.mk>
 
Index: sys/boot/ficl/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/ficl/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sys/boot/ficl/Makefile	20 Apr 2005 20:27:04 -0000	1.7
+++ sys/boot/ficl/Makefile	30 Jun 2005 21:19:38 -0000
@@ -56,7 +56,7 @@
 beforedepend ${OBJS}: machine
 
 machine:
-	ln -sf ${.CURDIR}/../../i386/include machine
+	${LN} -sf ${.CURDIR}/../../i386/include machine
 
 CLEANFILES+=	machine
 .endif
Index: sys/boot/i386/boot2/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/i386/boot2/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- sys/boot/i386/boot2/Makefile	7 May 2005 21:22:32 -0000	1.13
+++ sys/boot/i386/boot2/Makefile	30 Jun 2005 21:19:38 -0000
@@ -158,7 +158,7 @@
 beforedepend ${OBJS}: machine
 
 machine:
-	ln -sf ${.CURDIR}/../../../i386/include machine
+	${LN} -sf ${.CURDIR}/../../../i386/include machine
 
 CLEANFILES+=	machine
 .endif
Index: sys/boot/i386/libi386/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/i386/libi386/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sys/boot/i386/libi386/Makefile	21 Feb 2004 06:37:05 -0000	1.4
+++ sys/boot/i386/libi386/Makefile	30 Jun 2005 21:19:38 -0000
@@ -44,7 +44,7 @@
 
 CLEANFILES+=	machine
 machine:
-	ln -sf ${.CURDIR}/../../../i386/include machine
+	${LN} -sf ${.CURDIR}/../../../i386/include machine
 
 .endif
 
Index: sys/boot/i386/loader/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/i386/loader/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- sys/boot/i386/loader/Makefile	14 Oct 2004 09:41:01 -0000	1.7
+++ sys/boot/i386/loader/Makefile	30 Jun 2005 21:19:38 -0000
@@ -134,7 +134,7 @@
 beforedepend ${OBJS}: machine
 
 machine:
-	ln -sf ${.CURDIR}/../../../i386/include machine
+	${LN} -sf ${.CURDIR}/../../../i386/include machine
 
 .endif
 
Index: sys/boot/ia64/libski/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/ia64/libski/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/boot/ia64/libski/Makefile	10 Nov 2003 06:08:37 -0000	1.1
+++ sys/boot/ia64/libski/Makefile	30 Jun 2005 21:19:38 -0000
@@ -28,7 +28,7 @@
 .endif
 
 machine:
-	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
+	${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
 CLEANFILES+=	machine
 
Index: sys/boot/ia64/skiload/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/ia64/skiload/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/boot/ia64/skiload/Makefile	10 Nov 2003 06:08:37 -0000	1.1
+++ sys/boot/ia64/skiload/Makefile	30 Jun 2005 21:19:38 -0000
@@ -73,7 +73,7 @@
 .endif
 
 machine:
-	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
+	${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
 ${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} ${LIBSTAND} vers.o
 	${LD} ${LDFLAGS} -o ${PROG} -M \
Index: sys/boot/ofw/libofw/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/ofw/libofw/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/boot/ofw/libofw/Makefile	10 Nov 2003 06:08:37 -0000	1.1
+++ sys/boot/ofw/libofw/Makefile	30 Jun 2005 21:19:38 -0000
@@ -24,7 +24,7 @@
 .endif
 
 machine:
-	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
+	${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
 CLEANFILES+=	machine
 
Index: sys/boot/powerpc/loader/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/powerpc/loader/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/boot/powerpc/loader/Makefile	10 Nov 2003 06:08:40 -0000	1.1
+++ sys/boot/powerpc/loader/Makefile	30 Jun 2005 21:19:38 -0000
@@ -105,7 +105,7 @@
 		vers.o ${LIBFICL} ${LIBOFW} ${LIBSTAND}
 
 machine:
-	ln -sf ${.CURDIR}/../../../powerpc/include machine
+	${LN} -sf ${.CURDIR}/../../../powerpc/include machine
 
 # Cannot use ${OBJS} above this line
 .include <bsd.prog.mk>
Index: sys/boot/sparc64/loader/Makefile
===================================================================
RCS file: /cvs/src/sys/boot/sparc64/loader/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- sys/boot/sparc64/loader/Makefile	10 Nov 2003 06:08:40 -0000	1.1
+++ sys/boot/sparc64/loader/Makefile	30 Jun 2005 21:19:38 -0000
@@ -108,7 +108,7 @@
 beforedepend ${OBJS}: machine
 
 machine:
-	ln -sf ${.CURDIR}/../../../sparc64/include machine
+	${LN} -sf ${.CURDIR}/../../../sparc64/include machine
 .endif
 
 CLEANFILES+=	machine
Index: sys/conf/kmod.mk
===================================================================
RCS file: /cvs/src/sys/conf/kmod.mk,v
retrieving revision 1.21
diff -u -r1.21 kmod.mk
--- sys/conf/kmod.mk	27 Jun 2005 11:03:43 -0000	1.21
+++ sys/conf/kmod.mk	30 Jun 2005 21:19:38 -0000
@@ -176,7 +176,7 @@
 		path=${.CURDIR}/${MACHINE_ARCH} ;; \
 	esac ; \
 	${ECHO} ${.TARGET} "->" $$path ; \
-	ln -s $$path ${.TARGET}
+	${LN} -s $$path ${.TARGET}
 
 CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS} symb.tmp tmp.o
 
Index: sys/i386/Makefile
===================================================================
RCS file: /cvs/src/sys/i386/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- sys/i386/Makefile	11 Jun 2005 09:03:49 -0000	1.5
+++ sys/i386/Makefile	30 Jun 2005 21:19:38 -0000
@@ -19,11 +19,11 @@
 
 links::
 	-for i in ${COMMDIR1}; do \
-	    (cd $$i && { rm -f tags; ln -s ../${TAGDIR}/tags tags; }) done
+	    (cd $$i && { rm -f tags; ${LN} -s ../${TAGDIR}/tags tags; }) done
 	-for i in ${COMMDIR2}; do \
-	    (cd $$i && { rm -f tags; ln -s ../../${TAGDIR}/tags tags; }) done
+	    (cd $$i && { rm -f tags; ${LN} -s ../../${TAGDIR}/tags tags; }) done
 	-for i in ${DI386}; do \
-	    (cd $$i && { rm -f tags; ln -s ../tags tags; }) done
+	    (cd $$i && { rm -f tags; ${LN} -s ../tags tags; }) done
 
 SI386=	${SYS}/i386/acpica/*.[ch] ${SYS}/i386/apm/*.[ch] \
 	${SYS}/i386/i386/*.[ch] ${SYS}/i386/include/*.[ch] \
Index: sys/kern/Makefile.misc
===================================================================
RCS file: /cvs/src/sys/kern/Makefile.misc,v
retrieving revision 1.1
diff -u -r1.1 Makefile.misc
--- sys/kern/Makefile.misc	21 Aug 2003 20:08:26 -0000	1.1
+++ sys/kern/Makefile.misc	30 Jun 2005 21:19:38 -0000
@@ -52,9 +52,9 @@
 #
 #links::
 #	rm -f ${.CURDIR}/${SYSTAGS}
-#	-ln -s ${SYSDIR}/${MACHINE_ARCH}/tags ${.CURDIR}/${SYSTAGS}
+#	-${LN} -s ${SYSDIR}/${MACHINE_ARCH}/tags ${.CURDIR}/${SYSTAGS}
 #	-cd ${.CURDIR} && for i in ${DGEN}; do \
-#	    (cd ../$$i && { rm -f tags; ln -s ${SYSTAGS} tags; }) done
+#	    (cd ../$$i && { rm -f tags; ${LN} -s ${SYSTAGS} tags; }) done
 #	-cd ${.CURDIR} && for i in ${TAGARCH}; do \
 #	    (cd ../$$i && make ${MFLAGS} SYSTAGS=${SYSTAGS} links); done
 
Index: usr.bin/awk/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/awk/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- usr.bin/awk/Makefile	9 Nov 2004 19:31:14 -0000	1.8
+++ usr.bin/awk/Makefile	30 Jun 2005 21:19:38 -0000
@@ -19,7 +19,7 @@
 CLEANFILES= maketab proctab.c ytab.h maketab.nx
 
 ytab.h: awkgram.h
-	ln -sf ${.ALLSRC} ${.TARGET}
+	${LN} -sf ${.ALLSRC} ${.TARGET}
 
 proctab.c: maketab.nx
 	./maketab.nx > proctab.c
Index: usr.bin/calendar/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/calendar/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- usr.bin/calendar/Makefile	17 Jun 2003 04:29:25 -0000	1.2
+++ usr.bin/calendar/Makefile	30 Jun 2005 21:19:38 -0000
@@ -21,15 +21,15 @@
 .endfor
 .for link in ${DE_LINKS}
 	rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
-	ln -s de_DE.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
+	${LN} -s de_DE.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
 .for link in ${FR_LINKS}
 	rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
-	ln -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
+	${LN} -s fr_FR.ISO8859-1 ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
 .for link in ${HR_LINKS}
 	rm -rf ${DESTDIR}${SHAREDIR}/calendar/${link}
-	ln -s hr_HR.ISO8859-2 ${DESTDIR}${SHAREDIR}/calendar/${link}
+	${LN} -s hr_HR.ISO8859-2 ${DESTDIR}${SHAREDIR}/calendar/${link}
 .endfor
 
 .include <bsd.prog.mk>
Index: usr.bin/less/Makefile.common
===================================================================
RCS file: /cvs/src/usr.bin/less/Makefile.common,v
retrieving revision 1.3
diff -u -r1.3 Makefile.common
--- usr.bin/less/Makefile.common	20 Apr 2004 17:43:33 -0000	1.3
+++ usr.bin/less/Makefile.common	30 Jun 2005 21:19:38 -0000
@@ -9,4 +9,4 @@
 .SUFFIXES: .nro .1
 
 .nro.1:
-	ln -s ${.IMPSRC} ${.TARGET}
+	${LN} -s ${.IMPSRC} ${.TARGET}
Index: usr.bin/vacation/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/vacation/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- usr.bin/vacation/Makefile	13 Feb 2004 03:53:37 -0000	1.4
+++ usr.bin/vacation/Makefile	30 Jun 2005 21:19:38 -0000
@@ -48,6 +48,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: usr.bin/vi/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/vi/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- usr.bin/vi/Makefile	17 Jun 2003 04:29:33 -0000	1.2
+++ usr.bin/vi/Makefile	30 Jun 2005 21:19:38 -0000
@@ -171,52 +171,52 @@
 		${CATALOGS:S;^;${SRCDIR}/catalog/;} \
 		${DESTDIR}/usr/share/vi/catalog
 	for l in ${NLLINKS}; do \
-		ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
-		ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
-		ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
-		ln -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
+		${LN} -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
+		${LN} -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
+		${LN} -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
+		${LN} -fs dutch ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
 	done
 	for l in ${ENLINKS}; do \
-		ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
-		ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
-		ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
-		ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
-		ln -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.US-ASCII; \
-	done
-	ln -fs english ${DESTDIR}/usr/share/vi/catalog/en_US.US-ASCII
-	ln -fs english ${DESTDIR}/usr/share/vi/catalog/US-ASCII
-	ln -fs english ${DESTDIR}/usr/share/vi/catalog/ASCII
-	ln -fs english ${DESTDIR}/usr/share/vi/catalog/POSIX
-	ln -fs english ${DESTDIR}/usr/share/vi/catalog/C
+		${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
+		${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
+		${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
+		${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
+		${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/$$l.US-ASCII; \
+	done
+	${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/en_US.US-ASCII
+	${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/US-ASCII
+	${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/ASCII
+	${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/POSIX
+	${LN} -fs english ${DESTDIR}/usr/share/vi/catalog/C
 	for l in ${FRLINKS}; do \
-		ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
-		ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
-		ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
-		ln -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
+		${LN} -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
+		${LN} -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
+		${LN} -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
+		${LN} -fs french ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
 	done
 	for l in ${DELINKS}; do \
-		ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
-		ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
-		ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
-		ln -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
+		${LN} -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
+		${LN} -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
+		${LN} -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
+		${LN} -fs german ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
 	done
 	for l in ${ESLINKS}; do \
-		ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
-		ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
-		ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
-		ln -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
+		${LN} -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
+		${LN} -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
+		${LN} -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
+		${LN} -fs spanish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
 	done
 	for l in ${SVLINKS}; do \
-		ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
-		ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
-		ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
-		ln -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
+		${LN} -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-1; \
+		${LN} -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-1; \
+		${LN} -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-15; \
+		${LN} -fs swedish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-15; \
 	done
 	for l in ${PLLINKS}; do \
-		ln -fs polish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-2; \
-		ln -fs polish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-2; \
+		${LN} -fs polish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO8859-2; \
+		${LN} -fs polish ${DESTDIR}/usr/share/vi/catalog/$$l.ISO_8859-2; \
 	done
-	ln -fs ru_SU.KOI8-R ${DESTDIR}/usr/share/vi/catalog/ru_RU.KOI8-R
+	${LN} -fs ru_SU.KOI8-R ${DESTDIR}/usr/share/vi/catalog/ru_RU.KOI8-R
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${SRCDIR}/tcl_scripts/*.tcl \
 		${DESTDIR}/usr/share/vi/tcl
Index: usr.sbin/editmap/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/editmap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- usr.sbin/editmap/Makefile	31 Jan 2004 06:56:44 -0000	1.3
+++ usr.sbin/editmap/Makefile	30 Jun 2005 21:19:38 -0000
@@ -45,6 +45,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: usr.sbin/mailstats/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/mailstats/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- usr.sbin/mailstats/Makefile	31 Jan 2004 06:56:45 -0000	1.3
+++ usr.sbin/mailstats/Makefile	30 Jun 2005 21:19:38 -0000
@@ -39,6 +39,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: usr.sbin/makemap/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/makemap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- usr.sbin/makemap/Makefile	31 Jan 2004 06:56:45 -0000	1.3
+++ usr.sbin/makemap/Makefile	30 Jun 2005 21:19:38 -0000
@@ -45,6 +45,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: usr.sbin/praliases/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/praliases/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- usr.sbin/praliases/Makefile	31 Jan 2004 06:56:46 -0000	1.3
+++ usr.sbin/praliases/Makefile	30 Jun 2005 21:19:38 -0000
@@ -45,6 +45,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: usr.sbin/rmt/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/rmt/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- usr.sbin/rmt/Makefile	17 Jun 2003 04:30:02 -0000	1.2
+++ usr.sbin/rmt/Makefile	30 Jun 2005 21:19:38 -0000
@@ -8,6 +8,6 @@
 # called from /usr/src/etc/Makefile
 etc-rmt:
 	rm -f ${DESTDIR}/etc/rmt
-	ln -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt
+	${LN} -s ${BINDIR}/rmt ${DESTDIR}/etc/rmt
 
 .include <bsd.prog.mk>
Index: usr.sbin/sendmail/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/sendmail/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- usr.sbin/sendmail/Makefile	18 Aug 2004 16:55:21 -0000	1.8
+++ usr.sbin/sendmail/Makefile	30 Jun 2005 21:19:38 -0000
@@ -76,6 +76,6 @@
 LDFLAGS+=${SENDMAIL_LDFLAGS}
 
 sm_os.h:
-	ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
+	${LN} -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h
 
 .include <bsd.prog.mk>
Index: usr.sbin/ypserv/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/ypserv/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- usr.sbin/ypserv/Makefile	17 Jun 2003 04:30:04 -0000	1.2
+++ usr.sbin/ypserv/Makefile	30 Jun 2005 21:19:38 -0000
@@ -36,7 +36,7 @@
 	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 555 \
 		${.CURDIR}/ypinit.sh ${DESTDIR}${BINDIR}/ypinit
 	@if [ ! -f ${DESTDIR}/var/yp/Makefile.dist ]; then \
-		ln -s	${DESTDIR}/var/yp/Makefile.dist \
+		${LN} -s	${DESTDIR}/var/yp/Makefile.dist \
 			${DESTDIR}/var/yp/Makefile; fi
 
 .include <bsd.prog.mk>

Attachment: pgp00004.pgp
Description: PGP signature



[Date Prev][Date Next]  [Thread Prev][Thread Next]  [Date Index][Thread Index]