[Midnightbsd-cvs] src [8980] trunk: replace all known uses of ln in build process with install -l invocations

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Sep 29 21:12:16 EDT 2016 

Revision: 8980
          http://svnweb.midnightbsd.org/src/?rev=8980
Author:   laffer1
Date:     2016-09-29 21:12:16 -0400 (Thu, 29 Sep 2016)
Log Message:
-----------
replace all known uses of ln in build process with install -l invocations

Modified Paths:
--------------
    trunk/etc/Makefile
    trunk/share/mk/bsd.incs.mk
    trunk/share/mk/bsd.info.mk
    trunk/share/mk/bsd.lib.mk
    trunk/share/mk/bsd.links.mk
    trunk/share/mk/bsd.man.mk

Modified: trunk/etc/Makefile
===================================================================
--- trunk/etc/Makefile	2016-09-30 01:11:36 UTC (rev 8979)
+++ trunk/etc/Makefile	2016-09-30 01:12:16 UTC (rev 8980)
@@ -322,26 +322,29 @@
 		    -f $$m -p $$d; \
 		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
 	done; true
-	ln -sfh usr/src/sys ${DESTDIR}/sys
+	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
 	cd ${DESTDIR}/usr/share/man; \
 	for mandir in man*; do \
-		ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
-		ln -sfh ../$$mandir ${DESTDIR}/usr/share/man/en.UTF-8/; \
+		${INSTALL_SYMLINK} ../$$mandir \
+		    ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
+		${INSTALL_SYMLINK} ../$$mandir \
+		    ${DESTDIR}/usr/share/man/en.UTF-8/; \
 	done
 	cd ${DESTDIR}/usr/share/openssl/man; \
 	for mandir in man*; do \
-		ln -sfh ../$$mandir \
+		${INSTALL_SYMLINK} ../$$mandir \
 		    ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
 	done
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; do \
-		ln -sfh "$$2" "${DESTDIR}/usr/share/man/$$1"; \
-		ln -sfh "$$2" "${DESTDIR}/usr/share/openssl/man/$$1"; \
+		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
+		${INSTALL_SYMLINK} "$$2" \
+		    "${DESTDIR}/usr/share/openssl/man/$$1"; \
 		shift; shift; \
 	done
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \
-		ln -sfh "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
+		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
 		shift; shift; \
 	done
 

Modified: trunk/share/mk/bsd.incs.mk
===================================================================
--- trunk/share/mk/bsd.incs.mk	2016-09-30 01:11:36 UTC (rev 8979)
+++ trunk/share/mk/bsd.incs.mk	2016-09-30 01:12:16 UTC (rev 8980)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/bsd.incs.mk,v 1.4 2005/04/11 07:13:29 harti Exp $
-# $MidnightBSD: src/share/mk/bsd.incs.mk,v 1.2 2006/05/22 06:03:21 laffer1 Exp $
+# $MidnightBSD$
 
 .if !target(__<bsd.init.mk>__)
 .error bsd.incs.mk cannot be included directly.
@@ -74,7 +74,7 @@
 		t=${DESTDIR}$$1; \
 		shift; \
 		${ECHO} $$t -\> $$l; \
-		ln -fs $$l $$t; \
+		${INSTALL_SYMLINK} $$l $$t; \
 	done; true
 .endif
 .endif # !target(installincludes)

Modified: trunk/share/mk/bsd.info.mk
===================================================================
--- trunk/share/mk/bsd.info.mk	2016-09-30 01:11:36 UTC (rev 8979)
+++ trunk/share/mk/bsd.info.mk	2016-09-30 01:12:16 UTC (rev 8980)
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/bsd.info.mk,v 1.71 2005/02/27 22:02:31 obrien Exp $
-# $MidnightBSD: src/share/mk/bsd.info.mk,v 1.3 2007/01/19 02:25:17 laffer1 Exp $
+# $MidnightBSD$
 #
 # The include file <bsd.info.mk> handles installing GNU (tech)info files.
 # Texinfo is a documentation system that uses a single source
@@ -114,7 +114,7 @@
 
 .info.html:
 	${INFO2HTML} ${.IMPSRC}
-	ln -f ${.TARGET:R}.info.Top.html ${.TARGET}
+	${INSTALL_LINK} ${.TARGET:R}.info.Top.html ${.TARGET}
 
 .PATH: ${.CURDIR} ${SRCDIR}
 

Modified: trunk/share/mk/bsd.lib.mk
===================================================================
--- trunk/share/mk/bsd.lib.mk	2016-09-30 01:11:36 UTC (rev 8979)
+++ trunk/share/mk/bsd.lib.mk	2016-09-30 01:12:16 UTC (rev 8980)
@@ -197,9 +197,9 @@
 ${SHLIB_NAME}: ${SOBJS}
 .endif
 	@${ECHO} building shared library ${SHLIB_NAME}
-	@rm -f ${.TARGET} ${SHLIB_LINK}
+	@rm -f ${SHLIB_NAME} ${SHLIB_LINK}
 .if defined(SHLIB_LINK)
-	@ln -fs ${.TARGET} ${SHLIB_LINK}
+	@${INSTALL_SYMLINK} ${SHLIB_NAME} ${SHLIB_LINK}
 .endif
 .if !defined(NM)
 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
@@ -310,9 +310,9 @@
 	    ${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
 .else
 .if ${SHLIBDIR} == ${LIBDIR}
-	ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+	${INSTALL_SYMLINK} ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
 .else
-	ln -fs ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
+	${INSTALL_SYMLINK} ${_SHLIBDIRPREFIX}${SHLIBDIR}/${SHLIB_NAME} \
 	    ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
 .if exists(${DESTDIR}${LIBDIR}/${SHLIB_NAME})
 	-chflags noschg ${DESTDIR}${LIBDIR}/${SHLIB_NAME}

Modified: trunk/share/mk/bsd.links.mk
===================================================================
--- trunk/share/mk/bsd.links.mk	2016-09-30 01:11:36 UTC (rev 8979)
+++ trunk/share/mk/bsd.links.mk	2016-09-30 01:12:16 UTC (rev 8980)
@@ -16,7 +16,7 @@
 		t=${DESTDIR}$$1; \
 		shift; \
 		${ECHO} $$t -\> $$l; \
-		ln -f $$l $$t; \
+		${INSTALL_LINK} $$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; \
+		${INSTALL_SYMLINK} $$l $$t; \
 	done; true
 .endif

Modified: trunk/share/mk/bsd.man.mk
===================================================================
--- trunk/share/mk/bsd.man.mk	2016-09-30 01:11:36 UTC (rev 8979)
+++ trunk/share/mk/bsd.man.mk	2016-09-30 01:12:16 UTC (rev 8980)
@@ -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}; \
+		${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
 	done
 .if defined(MANBUILDCAT) && !empty(MANBUILDCAT)
 	@set ${MLINKS:C/\.([^.]*)$/.\1 \1/}; \
@@ -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}; \
+		${INSTALL_LINK} $${l}${ZEXT} $${t}${ZEXT}; \
 	done
 .endif
 .endif

More information about the Midnightbsd-cvs mailing list