[Midnightbsd-cvs] src [9316] trunk: Replace all known uses of ln in the build process with appropriate

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Mar 2 19:14:29 EST 2017 

Revision: 9316
          http://svnweb.midnightbsd.org/src/?rev=9316
Author:   laffer1
Date:     2017-03-02 19:14:29 -0500 (Thu, 02 Mar 2017)
Log Message:
-----------
Replace all known uses of ln in the build process with appropriate
install -l invocations via new INSTALL_LINK and INSTALL_SYMLINK
variables.

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
    trunk/share/mk/bsd.own.mk

Modified: trunk/etc/Makefile
===================================================================
--- trunk/etc/Makefile	2017-03-03 00:13:29 UTC (rev 9315)
+++ trunk/etc/Makefile	2017-03-03 00:14:29 UTC (rev 9316)
@@ -323,26 +323,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	2017-03-03 00:13:29 UTC (rev 9315)
+++ trunk/share/mk/bsd.incs.mk	2017-03-03 00:14:29 UTC (rev 9316)
@@ -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	2017-03-03 00:13:29 UTC (rev 9315)
+++ trunk/share/mk/bsd.info.mk	2017-03-03 00:14:29 UTC (rev 9316)
@@ -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	2017-03-03 00:13:29 UTC (rev 9315)
+++ trunk/share/mk/bsd.lib.mk	2017-03-03 00:14:29 UTC (rev 9316)
@@ -199,7 +199,7 @@
 	@${ECHO} building shared library ${SHLIB_NAME}
 	@rm -f ${.TARGET} ${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	2017-03-03 00:13:29 UTC (rev 9315)
+++ trunk/share/mk/bsd.links.mk	2017-03-03 00:14:29 UTC (rev 9316)
@@ -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	2017-03-03 00:13:29 UTC (rev 9315)
+++ trunk/share/mk/bsd.man.mk	2017-03-03 00:14:29 UTC (rev 9316)
@@ -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

Modified: trunk/share/mk/bsd.own.mk
===================================================================
--- trunk/share/mk/bsd.own.mk	2017-03-03 00:13:29 UTC (rev 9315)
+++ trunk/share/mk/bsd.own.mk	2017-03-03 00:14:29 UTC (rev 9316)
@@ -190,6 +190,15 @@
 
 INCLUDEDIR?=	/usr/include
 
+#
+# install(1) parameters.
+#
+HRDLINK?=	-l h
+SYMLINK?=	-l s
+
+INSTALL_LINK?=		${INSTALL} ${HRDLINK}
+INSTALL_SYMLINK?=	${INSTALL} ${SYMLINK}
+
 # Common variables
 .if !defined(DEBUG_FLAGS)
 STRIP?=		-s

More information about the Midnightbsd-cvs mailing list