Date: Fri, 4 Dec 2015 03:17:14 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r291734 - in head: include lib/libc++ share/termcap Message-ID: <201512040317.tB43HE2d047218@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Dec 4 03:17:14 2015 New Revision: 291734 URL: https://svnweb.freebsd.org/changeset/base/291734 Log: Replace ln -s calls with INSTALL_SYMLINK Sponsored by: EMC / Isilon Storage Division Modified: head/include/Makefile head/lib/libc++/Makefile head/share/termcap/Makefile Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Fri Dec 4 03:17:10 2015 (r291733) +++ head/include/Makefile Fri Dec 4 03:17:14 2015 (r291734) @@ -260,81 +260,81 @@ symlinks: .for i in ${LDIRS} cd ${.CURDIR}/../sys/$i; \ for h in *.h; do \ - ln -fs ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + ${INSTALL_SYMLINK} ../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor .for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/bktr:Ndev/nand:Ndev/pci} cd ${.CURDIR}/../sys/$i; \ for h in *.h; do \ - ln -fs ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + ${INSTALL_SYMLINK} ../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor cd ${.CURDIR}/../sys/dev/acpica; \ for h in acpiio.h acpi_hpet.h; do \ - ln -fs ../../../../sys/dev/acpica/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/dev/acpica/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/acpica; \ done cd ${.CURDIR}/../sys/dev/agp; \ for h in agpreg.h; do \ - ln -fs ../../../../sys/dev/agp/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/dev/agp/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/agp; \ done cd ${.CURDIR}/../sys/dev/bktr; \ for h in ioctl_*.h; do \ - ln -fs ../../../../sys/dev/bktr/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/dev/bktr/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/bktr; \ done .if ${MK_NAND} != "no" cd ${.CURDIR}/../sys/dev/nand; \ for h in nandsim.h nand_dev.h; do \ - ln -fs ../../../../sys/dev/nand/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/dev/nand/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/nand; \ done .endif cd ${.CURDIR}/../sys/dev/pci; \ for h in pcireg.h; do \ - ln -fs ../../../../sys/dev/pci/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/dev/pci/$$h \ ${DESTDIR}${INCLUDEDIR}/dev/pci; \ done .for i in ${LSUBSUBDIRS} cd ${.CURDIR}/../sys/$i; \ for h in *.h; do \ - ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ + ${INSTALL_SYMLINK} ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ for h in *.h; do \ - ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \ + ${INSTALL_SYMLINK} ../../../sys/contrib/ipfilter/netinet/$$h \ ${DESTDIR}${INCLUDEDIR}/netinet; \ done .endif .if ${MK_PF} != "no" cd ${.CURDIR}/../sys/netpfil/pf; \ for h in *.h; do \ - ln -fs ../../../../sys/netpfil/pf/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/netpfil/pf/$$h \ ${DESTDIR}${INCLUDEDIR}/netpfil/pf; \ done .endif cd ${.CURDIR}/../sys/crypto; \ for h in rijndael/rijndael.h; do \ - ln -fs ../../../sys/crypto/$$h \ + ${INSTALL_SYMLINK} ../../../sys/crypto/$$h \ ${DESTDIR}${INCLUDEDIR}/crypto; \ done cd ${.CURDIR}/../sys/opencrypto; \ for h in *.h; do \ - ln -fs ../../../sys/opencrypto/$$h \ + ${INSTALL_SYMLINK} ../../../sys/opencrypto/$$h \ ${DESTDIR}${INCLUDEDIR}/crypto; \ done cd ${.CURDIR}/../sys/${MACHINE}/include; \ for h in *.h; do \ - ln -fs ../../../sys/${MACHINE}/include/$$h \ + ${INSTALL_SYMLINK} ../../../sys/${MACHINE}/include/$$h \ ${DESTDIR}${INCLUDEDIR}/machine; \ done .if exists(${.CURDIR}/../sys/${MACHINE}/include/pc) cd ${.CURDIR}/../sys/${MACHINE}/include/pc; \ for h in *.h; do \ - ln -fs ../../../../sys/${MACHINE}/include/pc/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/${MACHINE}/include/pc/$$h \ ${DESTDIR}${INCLUDEDIR}/machine/pc; \ done .endif @@ -344,7 +344,7 @@ symlinks: ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ cd ${.CURDIR}/../sys/${_MARCH}/include; \ for h in *.h; do \ - ln -fs ../../../sys/${_MARCH}/include/$$h \ + ${INSTALL_SYMLINK} ../../../sys/${_MARCH}/include/$$h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}; \ done .if exists(${.CURDIR}/../sys/${_MARCH}/include/pc) @@ -352,7 +352,7 @@ symlinks: ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ cd ${.CURDIR}/../sys/${_MARCH}/include/pc; \ for h in *.h; do \ - ln -fs ../../../../sys/${_MARCH}/include/pc/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/${_MARCH}/include/pc/$$h \ ${DESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ done .endif @@ -360,12 +360,12 @@ symlinks: .endfor cd ${.CURDIR}/../sys/fs/cd9660; \ for h in *.h; do \ - ln -fs ../../../../sys/fs/cd9660/$$h \ + ${INSTALL_SYMLINK} ../../../../sys/fs/cd9660/$$h \ ${DESTDIR}${INCLUDEDIR}/isofs/cd9660; \ done cd ${.CURDIR}/../sys/rpc; \ for h in types.h; do \ - ln -fs ../../../sys/rpc/$$h \ + ${INSTALL_SYMLINK} ../../../sys/rpc/$$h \ ${DESTDIR}${INCLUDEDIR}/rpc; \ done .if ${MK_DIRDEPS_BUILD} == "yes" Modified: head/lib/libc++/Makefile ============================================================================== --- head/lib/libc++/Makefile Fri Dec 4 03:17:10 2015 (r291733) +++ head/lib/libc++/Makefile Fri Dec 4 03:17:14 2015 (r291734) @@ -206,9 +206,9 @@ EXTDIR= ${CXXINCLUDEDIR}/ext CLEANFILES+= libstdc++.so libstdc++.a afterinstall: - ln -sf ${DESTDIR}${LIBDIR}/lib${LIB}.so \ + ${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.so \ ${.OBJDIR}/libstdc++.so - ln -sf ${DESTDIR}${LIBDIR}/lib${LIB}.a \ + ${INSTALL_SYMLINK} ${DESTDIR}${LIBDIR}/lib${LIB}.a \ ${.OBJDIR}/libstdc++.a .endif Modified: head/share/termcap/Makefile ============================================================================== --- head/share/termcap/Makefile Fri Dec 4 03:17:10 2015 (r291733) +++ head/share/termcap/Makefile Fri Dec 4 03:17:14 2015 (r291734) @@ -24,6 +24,6 @@ termcap.db: termcap cap_mkdb ${CAP_MKDB_ENDIAN} -f ${.TARGET:R} ${.ALLSRC} etc-termcap: - ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap + ${INSTALL_SYMLINK} ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512040317.tB43HE2d047218>