svn commit: r280122 - head/share/mk

Baptiste Daroussin bapt at FreeBSD.org
Sun Mar 15 21:51:00 UTC 2015


Author: bapt
Date: Sun Mar 15 21:50:58 2015
New Revision: 280122
URL: https://svnweb.freebsd.org/changeset/base/280122

Log:
  Symplify links installation by using multi variable for loop
  
  Using multi variable for loop not only simplify the code, it also ensures that
  the LINKS and SYMLINKS input have the right number of words
  
  Differential Revision:	https://reviews.freebsd.org/D2069
  Reviewed by:	imp

Modified:
  head/share/mk/bsd.links.mk

Modified: head/share/mk/bsd.links.mk
==============================================================================
--- head/share/mk/bsd.links.mk	Sun Mar 15 21:43:43 2015	(r280121)
+++ head/share/mk/bsd.links.mk	Sun Mar 15 21:50:58 2015	(r280122)
@@ -7,25 +7,11 @@
 afterinstall: _installlinks
 .ORDER: realinstall _installlinks
 _installlinks:
-.if defined(LINKS) && !empty(LINKS)
-	@set ${LINKS}; \
-	while test $$# -ge 2; do \
-		l=${DESTDIR}$$1; \
-		shift; \
-		t=${DESTDIR}$$1; \
-		shift; \
-		${ECHO} $$t -\> $$l; \
-		${INSTALL_LINK} $$l $$t; \
-	done; true
-.endif
-.if defined(SYMLINKS) && !empty(SYMLINKS)
-	@set ${SYMLINKS}; \
-	while test $$# -ge 2; do \
-		l=$$1; \
-		shift; \
-		t=${DESTDIR}$$1; \
-		shift; \
-		${ECHO} $$t -\> $$l; \
-		${INSTALL_SYMLINK} $$l $$t; \
-	done; true
-.endif
+.for s t in ${LINKS}
+	@${ECHO} "$t -> $s" ;\
+	${INSTALL_LINK} $s $t
+.endfor
+.for s t in ${SYMLINKS}
+	@${ECHO} "$t -> $s" ;\
+	${INSTALL_SYMLINK} $s $t
+.endfor


More information about the svn-src-head mailing list