Date: Sat, 13 Jun 2015 23:12:07 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r284362 - user/ngie/more-tests/share/mk Message-ID: <201506132312.t5DNC7gh067282@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506132312.t5DNC7gh067282>