Skip to content

Commit

Permalink
Replace ln -s calls with INSTALL_SYMLINK
Browse files Browse the repository at this point in the history 
Sponsored by:	EMC / Isilon Storage Division
  • Loading branch information
@bdrewery
bdrewery committed Dec 4, 2015
1 parent 568f2ee commit a9f9ec2
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
36 changes: 18 additions & 18 deletions include/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -344,28 +344,28 @@ 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)
${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m 755 \
${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
.endif
.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"
Expand Down
4 changes: 2 additions & 2 deletions lib/libc++/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion share/termcap/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit a9f9ec2

Please sign in to comment.