From 062db326b5e9460dc3c821500636b49b36f0bd05 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Thu, 7 Jul 2005 11:49:57 +0000 Subject: [PATCH] convert ln to ${LN} --- Makefile.inc1 | 6 +- bin/csh/Makefile | 4 +- bin/rmail/Makefile | 4 +- etc/Makefile | 26 ++++----- gnu/usr.bin/binutils215/doc/Makefile | 4 +- gnu/usr.bin/binutils215/ld/Makefile | 6 +- gnu/usr.bin/texinfo/doc/Makefile | 4 +- include/Makefile | 16 +++--- lib/libmilter/Makefile | 4 +- lib/libpcap/Makefile | 4 +- lib/libsm/Makefile | 4 +- lib/libsmdb/Makefile | 4 +- lib/libsmutil/Makefile | 4 +- libexec/lukemftpd/Makefile | 4 +- libexec/mail.local/Makefile | 4 +- libexec/smrsh/Makefile | 4 +- nrelease/Makefile | 4 +- sbin/rcorder/Makefile | 4 +- share/colldef/Makefile | 22 ++++---- share/examples/Makefile | 4 +- share/mk/bsd.incs.mk | 4 +- share/mk/bsd.info.mk | 4 +- share/mk/bsd.lib.mk | 6 +- share/mk/bsd.links.mk | 6 +- share/mk/bsd.man.mk | 6 +- share/mk/bsd.obj.mk | 4 +- share/mk/bsd.prog.mk | 4 +- share/mk/sys.mk | 3 +- share/monetdef/Makefile | 30 +++++----- share/msgdef/Makefile | 60 ++++++++++---------- share/numericdef/Makefile | 82 ++++++++++++++-------------- share/sendmail/Makefile | 4 +- share/termcap/Makefile | 4 +- share/timedef/Makefile | 68 +++++++++++------------ sys/boot/efi/libefi/Makefile | 4 +- sys/boot/efi/loader/Makefile | 4 +- sys/boot/ficl/Makefile | 4 +- sys/boot/i386/boot2/Makefile | 4 +- sys/boot/i386/libi386/Makefile | 4 +- sys/boot/i386/loader/Makefile | 4 +- sys/boot/ia64/libski/Makefile | 4 +- sys/boot/ia64/skiload/Makefile | 4 +- sys/boot/ofw/libofw/Makefile | 4 +- sys/boot/pc32/boot2/Makefile | 4 +- sys/boot/pc32/libi386/Makefile | 4 +- sys/boot/pc32/loader/Makefile | 4 +- sys/boot/powerpc/loader/Makefile | 4 +- sys/boot/sparc64/loader/Makefile | 4 +- sys/conf/kmod.mk | 4 +- sys/i386/Makefile | 8 +-- sys/kern/Makefile.misc | 6 +- sys/platform/pc32/Makefile | 8 +-- usr.bin/awk/Makefile | 4 +- usr.bin/calendar/Makefile | 8 +-- usr.bin/less/Makefile.common | 4 +- usr.bin/vacation/Makefile | 4 +- usr.bin/vi/Makefile | 68 +++++++++++------------ usr.sbin/editmap/Makefile | 4 +- usr.sbin/mailstats/Makefile | 4 +- usr.sbin/makemap/Makefile | 4 +- usr.sbin/praliases/Makefile | 4 +- usr.sbin/rmt/Makefile | 4 +- usr.sbin/sendmail/Makefile | 4 +- usr.sbin/ypserv/Makefile | 4 +- 64 files changed, 310 insertions(+), 309 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index f65420b115..722a43f3bc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.71 2005/06/02 06:08:07 dillon Exp $ +# $DragonFly: src/Makefile.inc1,v 1.72 2005/07/07 11:49:55 corecode Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -305,7 +305,7 @@ _worldtmp: .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 @@ _strfile= games/fortune/strfile .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 \ diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 297842df5c..4767ee305c 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/bin/csh/Makefile,v 1.11.2.8 2002/02/19 00:36:40 mp Exp $ -# $DragonFly: src/bin/csh/Makefile,v 1.6 2005/03/10 14:35:09 joerg Exp $ +# $DragonFly: src/bin/csh/Makefile,v 1.7 2005/07/07 11:49:55 corecode Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -77,7 +77,7 @@ NLSSRCFILES_${catalog:C/.*://}!= cd ${NLSSRCDIR_${catalog:C/.*://}}; echo set[0- .endfor csh.1: tcsh.man - ln -sf ${.ALLSRC} ${.TARGET} + ${LN} -sf ${.ALLSRC} ${.TARGET} build-tools: gethost.nx diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index 4d94e792e0..a6e4319b9b 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD: src/bin/rmail/Makefile,v 1.8.2.6 2002/03/25 21:31:30 gshapiro Exp $ -# $DragonFly: src/bin/rmail/Makefile,v 1.5 2005/02/06 06:16:40 okumoto Exp $ +# $DragonFly: src/bin/rmail/Makefile,v 1.6 2005/07/07 11:49:55 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail @@ -43,6 +43,6 @@ LDFLAGS+=${SENDMAIL_LDFLAGS} 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 diff --git a/etc/Makefile b/etc/Makefile index fcac82852d..1d05d72154 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.73 2005/07/03 22:34:48 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.74 2005/07/07 11:49:55 corecode Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -125,8 +125,8 @@ upgrade_etc: preupgrade .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 @@ -382,8 +382,8 @@ distribution: ${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 \ @@ -395,7 +395,7 @@ distribution: @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 @@ -453,15 +453,15 @@ distrib-dirs: .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; \ @@ -469,16 +469,16 @@ distrib-dirs: 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 diff --git a/gnu/usr.bin/binutils215/doc/Makefile b/gnu/usr.bin/binutils215/doc/Makefile index afbdcb31f9..55593be703 100644 --- a/gnu/usr.bin/binutils215/doc/Makefile +++ b/gnu/usr.bin/binutils215/doc/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/gnu/usr.bin/binutils215/doc/Attic/Makefile,v 1.2 2005/01/04 14:28:06 joerg Exp $ +# $DragonFly: src/gnu/usr.bin/binutils215/doc/Attic/Makefile,v 1.3 2005/07/07 11:49:55 corecode Exp $ .include "../Makefile.inc0" @@ -26,7 +26,7 @@ as.info: as.texinfo asconfig.texi c-i386.texi gasver.texi 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 diff --git a/gnu/usr.bin/binutils215/ld/Makefile b/gnu/usr.bin/binutils215/ld/Makefile index 27c97d245b..24c591b87a 100644 --- a/gnu/usr.bin/binutils215/ld/Makefile +++ b/gnu/usr.bin/binutils215/ld/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/gnu/usr.bin/binutils215/ld/Attic/Makefile,v 1.3 2005/05/08 00:44:59 corecode Exp $ +# $DragonFly: src/gnu/usr.bin/binutils215/ld/Attic/Makefile,v 1.4 2005/07/07 11:49:55 corecode Exp $ .include "../Makefile.inc0" @@ -29,7 +29,7 @@ SRCS+= elf-hints.h CLEANFILES+= elf-hints.h elf-hints.h: - ln -sf ${.CURDIR}/../../../../include/${.TARGET} . + ${LN} -sf ${.CURDIR}/../../../../include/${.TARGET} . .endif WARNS= 1 @@ -65,7 +65,7 @@ ldemul-list.h: 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} \ diff --git a/gnu/usr.bin/texinfo/doc/Makefile b/gnu/usr.bin/texinfo/doc/Makefile index d36f473c3f..af3bfadcd7 100644 --- a/gnu/usr.bin/texinfo/doc/Makefile +++ b/gnu/usr.bin/texinfo/doc/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/gnu/usr.bin/texinfo/doc/Makefile,v 1.12 2000/01/17 10:59:24 ru Exp $ -# $DragonFly: src/gnu/usr.bin/texinfo/doc/Makefile,v 1.2 2003/06/17 04:25:49 dillon Exp $ +# $DragonFly: src/gnu/usr.bin/texinfo/doc/Makefile,v 1.3 2005/07/07 11:49:55 corecode Exp $ INFO= info info-stnd texinfo SRCDIR= ${TXIDIR}/doc @@ -7,6 +7,6 @@ SRCDIR= ${TXIDIR}/doc CLEANFILES= texinfo.texi texinfo.texi: texinfo.txi - ln -fs ${.ALLSRC} ${.TARGET} + ${LN} -fs ${.ALLSRC} ${.TARGET} .include diff --git a/include/Makefile b/include/Makefile index 511a82525a..36b7f092a2 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 # $FreeBSD: src/include/Makefile,v 1.109.2.27 2003/01/24 05:12:29 sam Exp $ -# $DragonFly: src/include/Makefile,v 1.24 2005/04/21 16:36:34 joerg Exp $ +# $DragonFly: src/include/Makefile,v 1.25 2005/07/07 11:49:55 corecode Exp $ # # Doing a make install builds /usr/include # @@ -174,7 +174,7 @@ copies: mtree_setup ${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 @@ symlinks: mtree_setup @${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 diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile index 2fa3ca9498..6be4d9b6a8 100644 --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libmilter/Makefile,v 1.1.2.2 2002/07/22 14:21:49 ru Exp $ -# $DragonFly: src/lib/libmilter/Makefile,v 1.3 2004/01/31 06:56:39 dillon Exp $ +# $DragonFly: src/lib/libmilter/Makefile,v 1.4 2005/07/07 11:49:55 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libmilter ${SENDMAIL_DIR}/libsm @@ -22,6 +22,6 @@ SRCS+= main.c engine.c listener.c handler.c comm.c smfi.c \ 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 diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile index 6dbc141982..3a4f70fbae 100644 --- a/lib/libpcap/Makefile +++ b/lib/libpcap/Makefile @@ -1,6 +1,6 @@ # Makefile for libpcap # $FreeBSD: src/lib/libpcap/Makefile,v 1.24.2.4 2002/07/22 14:21:50 ru Exp $ -# $DragonFly: src/lib/libpcap/Makefile,v 1.7 2005/04/21 13:42:34 joerg Exp $ +# $DragonFly: src/lib/libpcap/Makefile,v 1.8 2005/07/07 11:49:55 corecode Exp $ LIB= pcap SRCS= grammar.y tokdefs.h pcap-bpf.c version.h \ @@ -37,7 +37,7 @@ version.h: ${PCAP_DISTDIR}/VERSION ${PCAP_DISTDIR}/VERSION > $@ tokdefs.h: grammar.h - ln -sf grammar.h tokdefs.h + ${LN} -sf grammar.h tokdefs.h # # Apply patches diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index 528610ff38..c818e3cea2 100644 --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libsm/Makefile,v 1.1.2.2 2002/07/19 18:46:26 ru Exp $ -# $DragonFly: src/lib/libsm/Makefile,v 1.6 2004/07/23 18:15:08 drhodus Exp $ +# $DragonFly: src/lib/libsm/Makefile,v 1.7 2005/07/07 11:49:55 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsm @@ -32,6 +32,6 @@ CLEANFILES+=sm_os.h 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 diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile index 2f85c14208..7cf7521236 100644 --- a/lib/libsmdb/Makefile +++ b/lib/libsmdb/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libsmdb/Makefile,v 1.1.2.5 2002/07/19 18:46:26 ru Exp $ -# $DragonFly: src/lib/libsmdb/Makefile,v 1.3 2004/01/31 06:56:39 dillon Exp $ +# $DragonFly: src/lib/libsmdb/Makefile,v 1.4 2005/07/07 11:49:55 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmdb @@ -19,6 +19,6 @@ CLEANFILES+=sm_os.h 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 diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index 4a2c261511..e67d5a8172 100644 --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/lib/libsmutil/Makefile,v 1.1.2.5 2002/07/19 18:46:26 ru Exp $ -# $DragonFly: src/lib/libsmutil/Makefile,v 1.3 2004/01/31 06:56:39 dillon Exp $ +# $DragonFly: src/lib/libsmutil/Makefile,v 1.4 2005/07/07 11:49:55 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmutil @@ -19,6 +19,6 @@ CLEANFILES+=sm_os.h 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 diff --git a/libexec/lukemftpd/Makefile b/libexec/lukemftpd/Makefile index ebed55af94..d6d20aa9ac 100644 --- a/libexec/lukemftpd/Makefile +++ b/libexec/lukemftpd/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 # $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.5.2.2 2002/08/30 06:50:58 obrien Exp $ -# $DragonFly: src/libexec/lukemftpd/Attic/Makefile,v 1.3 2004/01/31 06:56:40 dillon Exp $ +# $DragonFly: src/libexec/lukemftpd/Attic/Makefile,v 1.4 2005/07/07 11:49:55 corecode Exp $ LUKEMFTPD= ${.CURDIR}/../../contrib/lukemftpd .PATH: ${LUKEMFTPD}/src @@ -42,7 +42,7 @@ LDADD+= ${MINUSLPAM} ftpd.o ftpcmd.o: version.h lukemftpd.8: ftpd.8 - ln -sf ${.ALLSRC} ${.TARGET} + ${LN} -sf ${.ALLSRC} ${.TARGET} CLEANFILES+= lukemftpd.8 diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index aac1559c31..115fc134ab 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 7/19/93 # $FreeBSD: src/libexec/mail.local/Makefile,v 1.10.2.7 2002/03/25 21:31:38 gshapiro Exp $ -# $DragonFly: src/libexec/mail.local/Makefile,v 1.3 2004/01/31 06:56:40 dillon Exp $ +# $DragonFly: src/libexec/mail.local/Makefile,v 1.4 2005/07/07 11:49:55 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/mail.local @@ -30,6 +30,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index c05d166469..50ecbc962c 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 7/2/95 # $FreeBSD: src/libexec/smrsh/Makefile,v 1.1.6.6 2002/03/25 21:31:40 gshapiro Exp $ -# $DragonFly: src/libexec/smrsh/Makefile,v 1.3 2004/01/31 06:56:40 dillon Exp $ +# $DragonFly: src/libexec/smrsh/Makefile,v 1.4 2005/07/07 11:49:56 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/smrsh @@ -30,6 +30,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/nrelease/Makefile b/nrelease/Makefile index 466dd7ac6a..3c29cd08c9 100644 --- a/nrelease/Makefile +++ b/nrelease/Makefile @@ -1,4 +1,4 @@ -# $DragonFly: src/nrelease/Makefile,v 1.35 2005/06/29 17:24:35 swildner Exp $ +# $DragonFly: src/nrelease/Makefile,v 1.36 2005/07/07 11:49:56 corecode Exp $ # ISODIR ?= /usr/release @@ -136,7 +136,7 @@ buildiso: 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 diff --git a/sbin/rcorder/Makefile b/sbin/rcorder/Makefile index 9bee013640..4701114b10 100644 --- a/sbin/rcorder/Makefile +++ b/sbin/rcorder/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.1 1999/11/23 05:28:20 mrg Exp $ # $FreeBSD: src/sbin/rcorder/Makefile,v 1.3 2002/06/21 15:52:05 obrien Exp $ -# $DragonFly: src/sbin/rcorder/Makefile,v 1.2 2004/12/01 19:44:53 liamfoy Exp $ +# $DragonFly: src/sbin/rcorder/Makefile,v 1.3 2005/07/07 11:49:56 corecode Exp $ PROG= rcorder SRCS= ealloc.c hash.c rcorder.c @@ -17,6 +17,6 @@ SRCS+= util.h CLEANFILES+= util.h util.h: - ln -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET} + ${LN} -sf ${.CURDIR}/../../lib/libutil/libutil.h ${.TARGET} .include diff --git a/share/colldef/Makefile b/share/colldef/Makefile index 151f9d15ca..6e788ffedf 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/colldef/Makefile,v 1.32.2.11 2002/08/17 19:14:44 ache Exp $ -# $DragonFly: src/share/colldef/Makefile,v 1.4 2004/09/27 19:30:50 asmodai Exp $ +# $DragonFly: src/share/colldef/Makefile,v 1.5 2005/07/07 11:49:56 corecode Exp $ # NOMAN=YES @@ -95,35 +95,35 @@ afterinstall: ${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 diff --git a/share/examples/Makefile b/share/examples/Makefile index 559600dae4..2ff00b0122 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/examples/Makefile,v 1.28.2.6 2002/08/08 09:03:47 ru Exp $ -# $DragonFly: src/share/examples/Makefile,v 1.2 2003/06/17 04:36:57 dillon Exp $ +# $DragonFly: src/share/examples/Makefile,v 1.3 2005/07/07 11:49:56 corecode Exp $ # # Doing a make install builds /usr/share/examples @@ -33,7 +33,7 @@ copies:: .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: diff --git a/share/mk/bsd.incs.mk b/share/mk/bsd.incs.mk index 462bef6e69..4ad9897cbd 100644 --- a/share/mk/bsd.incs.mk +++ b/share/mk/bsd.incs.mk @@ -1,5 +1,5 @@ # $FreeBSD: src/share/mk/bsd.incs.mk,v 1.3.2.1 2002/07/22 14:21:51 ru Exp $ -# $DragonFly: src/share/mk/bsd.incs.mk,v 1.5 2005/04/12 23:35:37 okumoto Exp $ +# $DragonFly: src/share/mk/bsd.incs.mk,v 1.6 2005/07/07 11:49:56 corecode Exp $ .if !target(____) .error bsd.incs.mk cannot be included directly. @@ -72,7 +72,7 @@ installincludes: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -fhs $$l $$t; \ + ${LN} -fhs $$l $$t; \ done; true .endif .endif # !target(installincludes) diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index c2a047206c..1ffaf1a3e1 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -1,5 +1,5 @@ # $FreeBSD: src/share/mk/bsd.info.mk,v 1.57.2.7 2003/05/21 13:00:46 ru Exp $ -# $DragonFly: src/share/mk/bsd.info.mk,v 1.5 2005/01/06 14:54:57 swildner Exp $ +# $DragonFly: src/share/mk/bsd.info.mk,v 1.6 2005/07/07 11:49:56 corecode Exp $ # # The include file handles installing GNU (tex)info files. # Texinfo is a documentation system that uses a single source @@ -122,7 +122,7 @@ DVIPS2ASCII?= dvips2ascii .info.html: ${INFO2HTML} ${.IMPSRC} - ln -f ${.TARGET:R}.info.Top.html ${.TARGET} + ${LN} -f ${.TARGET:R}.info.Top.html ${.TARGET} .PATH: ${.CURDIR} ${SRCDIR} diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index e5c3879847..d8d2d1513a 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,6 +1,6 @@ # from: @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 # $FreeBSD: src/share/mk/bsd.lib.mk,v 1.91.2.15 2002/08/07 16:31:50 ru Exp $ -# $DragonFly: src/share/mk/bsd.lib.mk,v 1.11 2005/04/29 21:25:09 joerg Exp $ +# $DragonFly: src/share/mk/bsd.lib.mk,v 1.12 2005/07/07 11:49:56 corecode Exp $ # .include @@ -188,7 +188,7 @@ ${SHLIB_NAME}: ${SOBJS} @${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 @@ _libinstall: ${_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) diff --git a/share/mk/bsd.links.mk b/share/mk/bsd.links.mk index 982464c397..620ae57e4c 100644 --- a/share/mk/bsd.links.mk +++ b/share/mk/bsd.links.mk @@ -1,5 +1,5 @@ # $FreeBSD: src/share/mk/bsd.links.mk,v 1.2.2.2 2002/07/17 19:08:23 ru Exp $ -# $DragonFly: src/share/mk/bsd.links.mk,v 1.2 2003/06/17 04:37:02 dillon Exp $ +# $DragonFly: src/share/mk/bsd.links.mk,v 1.3 2005/07/07 11:49:56 corecode Exp $ .if !target(____) .error bsd.links.mk cannot be included directly. @@ -16,7 +16,7 @@ _installlinks: 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 @@ _installlinks: t=${DESTDIR}$$1; \ shift; \ ${ECHO} $$t -\> $$l; \ - ln -fs $$l $$t; \ + ${LN} -fs $$l $$t; \ done; true .endif diff --git a/share/mk/bsd.man.mk b/share/mk/bsd.man.mk index bdcedbf1b7..be1a162e61 100644 --- a/share/mk/bsd.man.mk +++ b/share/mk/bsd.man.mk @@ -1,5 +1,5 @@ # $FreeBSD: src/share/mk/bsd.man.mk,v 1.31.2.11 2002/12/19 13:48:33 ru Exp $ -# $DragonFly: src/share/mk/bsd.man.mk,v 1.2 2003/06/17 04:37:02 dillon Exp $ +# $DragonFly: src/share/mk/bsd.man.mk,v 1.3 2005/07/07 11:49:56 corecode Exp $ # # The include file handles installing manual pages and # their links. @@ -217,7 +217,7 @@ _maninstall: ${MAN} 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 @@ _maninstall: ${MAN} 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 diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index d6b2a61416..c9d955e9c0 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -1,5 +1,5 @@ # $FreeBSD: src/share/mk/bsd.obj.mk,v 1.30.2.10 2003/02/15 05:36:25 kris Exp $ -# $DragonFly: src/share/mk/bsd.obj.mk,v 1.3 2005/04/12 23:35:37 okumoto Exp $ +# $DragonFly: src/share/mk/bsd.obj.mk,v 1.4 2005/07/07 11:49:56 corecode Exp $ # # The include file handles creating the 'obj' directory # and cleaning up object files, etc. @@ -94,7 +94,7 @@ obj: 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 diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index b65c77e4b2..e783b65eea 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,6 +1,6 @@ # from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 # $FreeBSD: src/share/mk/bsd.prog.mk,v 1.86.2.17 2002/12/23 16:33:37 ru Exp $ -# $DragonFly: src/share/mk/bsd.prog.mk,v 1.9 2005/07/03 11:58:01 swildner Exp $ +# $DragonFly: src/share/mk/bsd.prog.mk,v 1.10 2005/07/07 11:49:56 corecode Exp $ .include @@ -120,7 +120,7 @@ _proginstall: .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) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 19b93d8aa1..b691e39f1c 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,6 +1,6 @@ # from: @(#)sys.mk 8.2 (Berkeley) 3/21/94 # $FreeBSD: src/share/mk/sys.mk,v 1.45.2.6 2002/12/23 16:33:37 ru Exp $ -# $DragonFly: src/share/mk/sys.mk,v 1.13 2005/06/05 19:23:10 corecode Exp $ +# $DragonFly: src/share/mk/sys.mk,v 1.14 2005/07/07 11:49:56 corecode Exp $ unix ?= We run FreeBSD, not UNIX. @@ -76,6 +76,7 @@ FFLAGS ?= -O EFLAGS ?= INSTALL ?= install +LN ?= ln LEX ?= lex LFLAGS ?= diff --git a/share/monetdef/Makefile b/share/monetdef/Makefile index 3047023d4a..ce2d468107 100644 --- a/share/monetdef/Makefile +++ b/share/monetdef/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/monetdef/Makefile,v 1.37.2.3 2002/08/17 19:38:08 ache Exp $ -# $DragonFly: src/share/monetdef/Makefile,v 1.7 2004/10/07 13:32:37 asmodai Exp $ +# $DragonFly: src/share/monetdef/Makefile,v 1.8 2005/07/07 11:49:56 corecode Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -98,52 +98,52 @@ afterinstall: ${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 diff --git a/share/msgdef/Makefile b/share/msgdef/Makefile index 8ab1086ce9..7b7e5994d9 100644 --- a/share/msgdef/Makefile +++ b/share/msgdef/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/msgdef/Makefile,v 1.38.2.3 2002/08/17 19:30:37 ache Exp $ -# $DragonFly: src/share/msgdef/Makefile,v 1.5 2004/09/28 16:30:13 asmodai Exp $ +# $DragonFly: src/share/msgdef/Makefile,v 1.6 2005/07/07 11:49:56 corecode Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -92,104 +92,104 @@ afterinstall: ${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 diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index 0716b576ad..95aa9fd062 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/numericdef/Makefile,v 1.36.2.3 2002/08/17 19:34:11 ache Exp $ -# $DragonFly: src/share/numericdef/Makefile,v 1.6 2004/09/28 16:30:13 asmodai Exp $ +# $DragonFly: src/share/numericdef/Makefile,v 1.7 2005/07/07 11:49:56 corecode Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -80,128 +80,128 @@ afterinstall: ${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 .endfor .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 diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile index 7ddc889d5c..afa71094d3 100644 --- a/share/sendmail/Makefile +++ b/share/sendmail/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/sendmail/Makefile,v 1.1.2.7 2003/05/10 17:24:25 gshapiro Exp $ -# $DragonFly: src/share/sendmail/Makefile,v 1.3 2004/01/31 06:56:41 dillon Exp $ +# $DragonFly: src/share/sendmail/Makefile,v 1.4 2005/07/07 11:49:56 corecode Exp $ # # Doing a make install builds /usr/share/sendmail/ @@ -30,6 +30,6 @@ copies:: .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 diff --git a/share/termcap/Makefile b/share/termcap/Makefile index 46a79b0f53..1d4b117867 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD: src/share/termcap/Makefile,v 1.12.2.5 2002/07/17 15:10:20 ru Exp $ -# $DragonFly: src/share/termcap/Makefile,v 1.2 2003/06/17 04:37:03 dillon Exp $ +# $DragonFly: src/share/termcap/Makefile,v 1.3 2005/07/07 11:49:56 corecode Exp $ # reorder gives an editor command for most common terminals # (in reverse order from n'th to 1'st most commonly used) @@ -19,6 +19,6 @@ termcap.db: termcap cap_mkdb termcap etc-termcap: - ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap + ${LN} -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap .include diff --git a/share/timedef/Makefile b/share/timedef/Makefile index 5bc8628690..ff76b9ec80 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/share/timedef/Makefile,v 1.11.2.11 2002/08/17 19:25:45 ache Exp $ -# $DragonFly: src/share/timedef/Makefile,v 1.5 2004/09/27 14:44:33 asmodai Exp $ +# $DragonFly: src/share/timedef/Makefile,v 1.6 2005/07/07 11:49:56 corecode Exp $ NOMAN=YES CLEANFILES+= ${LOCALES:S/$/.out/g} @@ -107,100 +107,100 @@ afterinstall: ${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 diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile index 580e86bcd7..d6a5af00ac 100644 --- a/sys/boot/efi/libefi/Makefile +++ b/sys/boot/efi/libefi/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/efi/libefi/Makefile,v 1.12 2003/07/02 11:53:55 ru Exp $ -# $DragonFly: src/sys/boot/efi/libefi/Makefile,v 1.1 2003/11/10 06:08:32 dillon Exp $ +# $DragonFly: src/sys/boot/efi/libefi/Makefile,v 1.2 2005/07/07 11:49:56 corecode Exp $ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} @@ -31,7 +31,7 @@ CFLAGS+= -DDISK_DEBUG .endif machine: - ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine + ${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine CLEANFILES+= machine diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 50cf2da49d..f0b0951f09 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -# $DragonFly: src/sys/boot/efi/loader/Makefile,v 1.1 2003/11/10 06:08:33 dillon Exp $ +# $DragonFly: src/sys/boot/efi/loader/Makefile,v 1.2 2005/07/07 11:49:56 corecode Exp $ .PATH: ${.CURDIR}/../common @@ -113,7 +113,7 @@ start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S ${CC} -c ${CFLAGS} ${.IMPSRC} machine: - ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine + ${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine .include diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile index a4c35339d6..1dab4a335e 100644 --- a/sys/boot/ficl/Makefile +++ b/sys/boot/ficl/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/ficl/Makefile,v 1.35 2003/06/30 19:08:49 ru Exp $ -# $DragonFly: src/sys/boot/ficl/Makefile,v 1.7 2005/04/20 20:27:04 joerg Exp $ +# $DragonFly: src/sys/boot/ficl/Makefile,v 1.8 2005/07/07 11:49:56 corecode Exp $ # .if ${MACHINE_ARCH} == "amd64" .MAKEFLAGS: MACHINE_ARCH=i386 MACHINE=i386 REALLY_AMD64=true @@ -56,7 +56,7 @@ ${SRCS:M*.c:R:S/$/.o/g}: machine beforedepend ${OBJS}: machine machine: - ln -sf ${.CURDIR}/../../i386/include machine + ${LN} -sf ${.CURDIR}/../../i386/include machine CLEANFILES+= machine .endif diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index cd692042f2..820ef35d00 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/i386/boot2/Attic/Makefile,v 1.13 2005/05/07 21:22:32 corecode Exp $ +# $DragonFly: src/sys/boot/i386/boot2/Attic/Makefile,v 1.14 2005/07/07 11:49:56 corecode Exp $ PROG= boot2 NOMAN= @@ -158,7 +158,7 @@ boot2.o: machine beforedepend ${OBJS}: machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ${LN} -sf ${.CURDIR}/../../../i386/include machine CLEANFILES+= machine .endif diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index a493b52895..95e6cbcf4e 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.32 2003/07/02 12:45:45 ru Exp $ -# $DragonFly: src/sys/boot/i386/libi386/Attic/Makefile,v 1.4 2004/02/21 06:37:05 dillon Exp $ +# $DragonFly: src/sys/boot/i386/libi386/Attic/Makefile,v 1.5 2005/07/07 11:49:56 corecode Exp $ # LIB= i386 INTERNALLIB= true @@ -44,7 +44,7 @@ beforedepend ${OBJS}: machine CLEANFILES+= machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ${LN} -sf ${.CURDIR}/../../../i386/include machine .endif diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index abef748a8b..e0158b34c1 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.66 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/i386/loader/Attic/Makefile,v 1.9 2005/07/05 20:35:35 dillon Exp $ +# $DragonFly: src/sys/boot/i386/loader/Attic/Makefile,v 1.10 2005/07/07 11:49:56 corecode Exp $ # PROG= loader @@ -134,7 +134,7 @@ ${PROG}.sym: ${OBJS} ${LIBI386} ${LIBSTAND} ${LIBFICL} vers.o beforedepend ${OBJS}: machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ${LN} -sf ${.CURDIR}/../../../i386/include machine .endif diff --git a/sys/boot/ia64/libski/Makefile b/sys/boot/ia64/libski/Makefile index f65d1c43f9..a186a866ee 100644 --- a/sys/boot/ia64/libski/Makefile +++ b/sys/boot/ia64/libski/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/ia64/libski/Makefile,v 1.10 2003/07/02 11:47:33 ru Exp $ -# $DragonFly: src/sys/boot/ia64/libski/Makefile,v 1.1 2003/11/10 06:08:37 dillon Exp $ +# $DragonFly: src/sys/boot/ia64/libski/Makefile,v 1.2 2005/07/07 11:49:56 corecode Exp $ LIB= ski INTERNALLIB= true @@ -28,7 +28,7 @@ CFLAGS+= -DDISK_DEBUG .endif machine: - ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine + ${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine CLEANFILES+= machine diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile index c1fdf4c4ac..29830fd4fa 100644 --- a/sys/boot/ia64/skiload/Makefile +++ b/sys/boot/ia64/skiload/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/ia64/skiload/Makefile,v 1.12 2003/11/09 06:53:37 marcel Exp $ -# $DragonFly: src/sys/boot/ia64/skiload/Makefile,v 1.1 2003/11/10 06:08:37 dillon Exp $ +# $DragonFly: src/sys/boot/ia64/skiload/Makefile,v 1.2 2005/07/07 11:49:56 corecode Exp $ .PATH: ${.CURDIR}/../common @@ -73,7 +73,7 @@ beforeinstall: .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 \ diff --git a/sys/boot/ofw/libofw/Makefile b/sys/boot/ofw/libofw/Makefile index 078f74c4b1..8d1451154c 100644 --- a/sys/boot/ofw/libofw/Makefile +++ b/sys/boot/ofw/libofw/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/ofw/libofw/Makefile,v 1.8 2002/11/10 19:17:36 jake Exp $ -# $DragonFly: src/sys/boot/ofw/libofw/Makefile,v 1.1 2003/11/10 06:08:37 dillon Exp $ +# $DragonFly: src/sys/boot/ofw/libofw/Makefile,v 1.2 2005/07/07 11:49:57 corecode Exp $ LIB= ofw INTERNALLIB= true @@ -24,7 +24,7 @@ CFLAGS+= -DDISK_DEBUG .endif machine: - ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine + ${LN} -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine CLEANFILES+= machine diff --git a/sys/boot/pc32/boot2/Makefile b/sys/boot/pc32/boot2/Makefile index 30e269021f..6a26bf6a79 100644 --- a/sys/boot/pc32/boot2/Makefile +++ b/sys/boot/pc32/boot2/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.47 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/pc32/boot2/Makefile,v 1.13 2005/05/07 21:22:32 corecode Exp $ +# $DragonFly: src/sys/boot/pc32/boot2/Makefile,v 1.14 2005/07/07 11:49:56 corecode Exp $ PROG= boot2 NOMAN= @@ -158,7 +158,7 @@ boot2.o: machine beforedepend ${OBJS}: machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ${LN} -sf ${.CURDIR}/../../../i386/include machine CLEANFILES+= machine .endif diff --git a/sys/boot/pc32/libi386/Makefile b/sys/boot/pc32/libi386/Makefile index cc6d2874b3..77b2d798d2 100644 --- a/sys/boot/pc32/libi386/Makefile +++ b/sys/boot/pc32/libi386/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.32 2003/07/02 12:45:45 ru Exp $ -# $DragonFly: src/sys/boot/pc32/libi386/Makefile,v 1.4 2004/02/21 06:37:05 dillon Exp $ +# $DragonFly: src/sys/boot/pc32/libi386/Makefile,v 1.5 2005/07/07 11:49:56 corecode Exp $ # LIB= i386 INTERNALLIB= true @@ -44,7 +44,7 @@ beforedepend ${OBJS}: machine CLEANFILES+= machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ${LN} -sf ${.CURDIR}/../../../i386/include machine .endif diff --git a/sys/boot/pc32/loader/Makefile b/sys/boot/pc32/loader/Makefile index b8f3e24122..c030b966ae 100644 --- a/sys/boot/pc32/loader/Makefile +++ b/sys/boot/pc32/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.66 2003/06/26 03:51:57 peter Exp $ -# $DragonFly: src/sys/boot/pc32/loader/Makefile,v 1.9 2005/07/05 20:35:35 dillon Exp $ +# $DragonFly: src/sys/boot/pc32/loader/Makefile,v 1.10 2005/07/07 11:49:56 corecode Exp $ # PROG= loader @@ -134,7 +134,7 @@ ${PROG}.sym: ${OBJS} ${LIBI386} ${LIBSTAND} ${LIBFICL} vers.o beforedepend ${OBJS}: machine machine: - ln -sf ${.CURDIR}/../../../i386/include machine + ${LN} -sf ${.CURDIR}/../../../i386/include machine .endif diff --git a/sys/boot/powerpc/loader/Makefile b/sys/boot/powerpc/loader/Makefile index 6ab8b5a6e9..29f268c447 100644 --- a/sys/boot/powerpc/loader/Makefile +++ b/sys/boot/powerpc/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/powerpc/loader/Makefile,v 1.11 2003/08/16 02:48:20 obrien Exp $ -# $DragonFly: src/sys/boot/powerpc/loader/Makefile,v 1.1 2003/11/10 06:08:40 dillon Exp $ +# $DragonFly: src/sys/boot/powerpc/loader/Makefile,v 1.2 2005/07/07 11:49:57 corecode Exp $ BASE= loader PROG= ${BASE} @@ -105,7 +105,7 @@ ${PROG}: ${OBJS} ${LIBOFW} ${LIBSTAND} ${LIBFICL} start.o vers.o 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 diff --git a/sys/boot/sparc64/loader/Makefile b/sys/boot/sparc64/loader/Makefile index a888963b09..a91ecbb312 100644 --- a/sys/boot/sparc64/loader/Makefile +++ b/sys/boot/sparc64/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.15 2002/12/20 04:32:10 jake Exp $ -# $DragonFly: src/sys/boot/sparc64/loader/Makefile,v 1.1 2003/11/10 06:08:40 dillon Exp $ +# $DragonFly: src/sys/boot/sparc64/loader/Makefile,v 1.2 2005/07/07 11:49:57 corecode Exp $ BASE= loader PROG= ${BASE} @@ -108,7 +108,7 @@ FILES+= loader.rc beforedepend ${OBJS}: machine machine: - ln -sf ${.CURDIR}/../../../sparc64/include machine + ${LN} -sf ${.CURDIR}/../../../sparc64/include machine .endif CLEANFILES+= machine diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 559333798b..8a1e2b07ea 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -1,6 +1,6 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 # $FreeBSD: src/sys/conf/kmod.mk,v 1.82.2.15 2003/02/10 13:11:50 nyan Exp $ -# $DragonFly: src/sys/conf/kmod.mk,v 1.21 2005/06/27 11:03:43 corecode Exp $ +# $DragonFly: src/sys/conf/kmod.mk,v 1.22 2005/07/07 11:49:57 corecode Exp $ # # The include file handles installing Kernel Loadable Device # drivers (KLD's). @@ -176,7 +176,7 @@ ${_ILINKS}: 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 diff --git a/sys/i386/Makefile b/sys/i386/Makefile index 72543865c4..c903ad8a3e 100644 --- a/sys/i386/Makefile +++ b/sys/i386/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/i386/Makefile,v 1.8 2000/01/27 01:22:06 mckusick Exp $ -# $DragonFly: src/sys/i386/Attic/Makefile,v 1.5 2005/06/11 09:03:49 swildner Exp $ +# $DragonFly: src/sys/i386/Attic/Makefile,v 1.6 2005/07/07 11:49:57 corecode Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 # Makefile for i386 links, tags file @@ -19,11 +19,11 @@ DI386= acpica apm conf i386 include isa 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] \ diff --git a/sys/kern/Makefile.misc b/sys/kern/Makefile.misc index dcad3a689c..d18273114f 100644 --- a/sys/kern/Makefile.misc +++ b/sys/kern/Makefile.misc @@ -1,4 +1,4 @@ -# $DragonFly: src/sys/kern/Makefile.misc,v 1.1 2003/08/21 20:08:26 dillon Exp $ +# $DragonFly: src/sys/kern/Makefile.misc,v 1.2 2005/07/07 11:49:57 corecode Exp $ # # Makefile for kernel tags files, init_sysent, etc. @@ -52,9 +52,9 @@ DGEN= conf \ # #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 diff --git a/sys/platform/pc32/Makefile b/sys/platform/pc32/Makefile index 7545382857..32e7b6c71b 100644 --- a/sys/platform/pc32/Makefile +++ b/sys/platform/pc32/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/sys/i386/Makefile,v 1.8 2000/01/27 01:22:06 mckusick Exp $ -# $DragonFly: src/sys/platform/pc32/Makefile,v 1.5 2005/06/11 09:03:49 swildner Exp $ +# $DragonFly: src/sys/platform/pc32/Makefile,v 1.6 2005/07/07 11:49:57 corecode Exp $ # @(#)Makefile 8.1 (Berkeley) 6/11/93 # Makefile for i386 links, tags file @@ -19,11 +19,11 @@ DI386= acpica apm conf i386 include isa 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] \ diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index 2487ccce6e..73504b7973 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.bin/awk/Makefile,v 1.9.2.1 2002/06/21 20:12:08 obrien Exp $ -# $DragonFly: src/usr.bin/awk/Makefile,v 1.8 2004/11/09 19:31:14 joerg Exp $ +# $DragonFly: src/usr.bin/awk/Makefile,v 1.9 2005/07/07 11:49:57 corecode Exp $ AWKSRC= ${.CURDIR}/../../contrib/awk20040207 .PATH: ${AWKSRC} @@ -19,7 +19,7 @@ LDADD= -lm 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 diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index 574cf3de75..6b652f0b24 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.bin/calendar/Makefile,v 1.12.8.6 2003/04/06 20:04:56 dwmalone Exp $ -# $DragonFly: src/usr.bin/calendar/Makefile,v 1.2 2003/06/17 04:29:25 dillon Exp $ +# $DragonFly: src/usr.bin/calendar/Makefile,v 1.3 2005/07/07 11:49:57 corecode Exp $ PROG= calendar SRCS= calendar.c io.c day.c ostern.c paskha.c @@ -21,15 +21,15 @@ beforeinstall: .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 diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common index 640e4008ff..d219f412d9 100644 --- a/usr.bin/less/Makefile.common +++ b/usr.bin/less/Makefile.common @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.bin/less/Makefile.common,v 1.3.2.1 2000/06/30 01:03:15 ps Exp $ -# $DragonFly: src/usr.bin/less/Makefile.common,v 1.3 2004/04/20 17:43:33 eirikn Exp $ +# $DragonFly: src/usr.bin/less/Makefile.common,v 1.4 2005/07/07 11:49:57 corecode Exp $ LSDIR= ${.CURDIR}/../../contrib/less-381 .PATH: ${LSDIR} @@ -9,4 +9,4 @@ CFLAGS+=-I${.CURDIR}/../less -I${LSDIR} .SUFFIXES: .nro .1 .nro.1: - ln -s ${.IMPSRC} ${.TARGET} + ${LN} -s ${.IMPSRC} ${.TARGET} diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile index f0c6fe206f..35a4236408 100644 --- a/usr.bin/vacation/Makefile +++ b/usr.bin/vacation/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.bin/vacation/Makefile,v 1.6.2.3 2002/03/25 21:31:50 gshapiro Exp $ -# $DragonFly: src/usr.bin/vacation/Makefile,v 1.4 2004/02/13 03:53:37 dillon Exp $ +# $DragonFly: src/usr.bin/vacation/Makefile,v 1.5 2005/07/07 11:49:57 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/vacation @@ -48,6 +48,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index f47603e5d7..03e19c2bf5 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -1,6 +1,6 @@ # # $FreeBSD: src/usr.bin/vi/Makefile,v 1.27.2.7 2002/08/07 16:32:01 ru Exp $ -# $DragonFly: src/usr.bin/vi/Makefile,v 1.2 2003/06/17 04:29:33 dillon Exp $ +# $DragonFly: src/usr.bin/vi/Makefile,v 1.3 2005/07/07 11:49:57 corecode Exp $ # # This has most of the glue needed to compile tknvi and the perl hooks, # but not all. @@ -171,52 +171,52 @@ afterinstall: ${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; \ + ${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/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 diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile index 6ee6f14f4c..76f6973862 100644 --- a/usr.sbin/editmap/Makefile +++ b/usr.sbin/editmap/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/editmap/Makefile,v 1.1.2.1 2002/03/25 21:29:58 gshapiro Exp $ -# $DragonFly: src/usr.sbin/editmap/Makefile,v 1.3 2004/01/31 06:56:44 dillon Exp $ +# $DragonFly: src/usr.sbin/editmap/Makefile,v 1.4 2005/07/07 11:49:57 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/editmap @@ -45,6 +45,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile index 04d2e3b6bd..eacac02c66 100644 --- a/usr.sbin/mailstats/Makefile +++ b/usr.sbin/mailstats/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD: src/usr.sbin/mailstats/Makefile,v 1.1.6.6 2002/03/25 21:31:43 gshapiro Exp $ -# $DragonFly: src/usr.sbin/mailstats/Makefile,v 1.3 2004/01/31 06:56:45 dillon Exp $ +# $DragonFly: src/usr.sbin/mailstats/Makefile,v 1.4 2005/07/07 11:49:57 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/mailstats @@ -39,6 +39,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index 672ab153d0..454bb7c2a0 100644 --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.4 (Berkeley) 6/10/97 # $FreeBSD: src/usr.sbin/makemap/Makefile,v 1.2.6.6 2002/03/25 21:31:48 gshapiro Exp $ -# $DragonFly: src/usr.sbin/makemap/Makefile,v 1.3 2004/01/31 06:56:45 dillon Exp $ +# $DragonFly: src/usr.sbin/makemap/Makefile,v 1.4 2005/07/07 11:49:57 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/makemap @@ -45,6 +45,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile index 450e8bc5db..a2c5c09c20 100644 --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 9/21/96 # $FreeBSD: src/usr.sbin/praliases/Makefile,v 1.1.6.6 2002/03/25 21:31:46 gshapiro Exp $ -# $DragonFly: src/usr.sbin/praliases/Makefile,v 1.3 2004/01/31 06:56:46 dillon Exp $ +# $DragonFly: src/usr.sbin/praliases/Makefile,v 1.4 2005/07/07 11:49:57 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/praliases @@ -45,6 +45,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile index e126d5fb72..5fc64be76c 100644 --- a/usr.sbin/rmt/Makefile +++ b/usr.sbin/rmt/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD: src/usr.sbin/rmt/Makefile,v 1.6.8.1 2001/04/25 12:10:43 ru Exp $ -# $DragonFly: src/usr.sbin/rmt/Makefile,v 1.2 2003/06/17 04:30:02 dillon Exp $ +# $DragonFly: src/usr.sbin/rmt/Makefile,v 1.3 2005/07/07 11:49:57 corecode Exp $ PROG= rmt MAN= rmt.8 @@ -8,6 +8,6 @@ MAN= rmt.8 # 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 diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 5c1b7c1bed..52af1fcf8a 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.8 (Berkeley) 3/28/97 # $FreeBSD: src/usr.sbin/sendmail/Makefile,v 1.15.2.13 2002/03/25 21:32:29 gshapiro Exp $ -# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.8 2004/08/18 16:55:21 dillon Exp $ +# $DragonFly: src/usr.sbin/sendmail/Makefile,v 1.9 2005/07/07 11:49:57 corecode Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail SMDIR= ${SENDMAIL_DIR}/src @@ -76,6 +76,6 @@ LDADD+=${SENDMAIL_LDADD} 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 diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index 5be3d29f5f..4466b7bd1c 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -1,5 +1,5 @@ # $FreeBSD: src/usr.sbin/ypserv/Makefile,v 1.17.2.3 2002/08/07 16:32:02 ru Exp $ -# $DragonFly: src/usr.sbin/ypserv/Makefile,v 1.2 2003/06/17 04:30:04 dillon Exp $ +# $DragonFly: src/usr.sbin/ypserv/Makefile,v 1.3 2005/07/07 11:49:57 corecode Exp $ PROG= ypserv SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ @@ -36,7 +36,7 @@ afterinstall: ${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 -- 2.41.0