svn commit: r284362 - user/ngie/more-tests/share/mk

Garrett Cooper ngie at FreeBSD.org
Sat Jun 13 23:12:07 UTC 2015


Author: ngie
Date: Sat Jun 13 23:12:06 2015
New Revision: 284362
URL: https://svnweb.freebsd.org/changeset/base/284362

Log:
  Restore the more complicated logic removed in r280122 so fmake can bootstrap
  bmake for buildworld

Modified:
  user/ngie/more-tests/share/mk/bsd.links.mk

Modified: user/ngie/more-tests/share/mk/bsd.links.mk
==============================================================================
--- user/ngie/more-tests/share/mk/bsd.links.mk	Sat Jun 13 22:54:46 2015	(r284361)
+++ user/ngie/more-tests/share/mk/bsd.links.mk	Sat Jun 13 23:12:06 2015	(r284362)
@@ -7,6 +7,7 @@
 afterinstall: _installlinks
 .ORDER: realinstall _installlinks
 _installlinks:
+.ifdef .PARSEDIR
 .for s t in ${LINKS}
 	@${ECHO} "$t -> $s" ;\
 	${INSTALL_LINK} ${DESTDIR}$s ${DESTDIR}$t
@@ -15,3 +16,27 @@ _installlinks:
 	@${ECHO} "$t -> $s" ;\
 	${INSTALL_SYMLINK} $s ${DESTDIR}/$t
 .endfor
+.else # The following logic is needed for FMAKE in the bootstrapping process
+.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
+.endif


More information about the svn-src-user mailing list