make upgrade and DESTDIR (Re: ln -> ${LN} conversion)

YONETANI Tomokazu qhwt+dfly at les.ath.cx
Thu Jul 7 20:57:02 PDT 2005


On Sun, Jul 03, 2005 at 03:34:04AM +0200, Simon 'corecode' Schubert wrote:
> attached patch converts all ln commands in makefiles to ${LN}. this
> takes us one step further to a installworld which registers installed
> files (which in turn will allow us to clean out stale files much more
> easily). please test and comment.

(sorry, I couldn't comment on this before the commit)
When you're installing from an older system(-RELEASE, for example)
using DESTDIR, `make upgrade' fails because it uses older <sys.mk> in
the installing system, rather than from the source tree or from
$DESTDIR/share/mk.  If I specify the share/mk in the source tree using
MAKEFLAGS, it seems to work fine.

--- Makefile	22 Apr 2005 20:51:37 -0000	1.11
+++ Makefile	8 Jul 2005 03:53:00 -0000
@@ -179,7 +179,7 @@
 # Handle post-installworld updating of static files (e.g. like /etc/rc)
 #
 upgrade_etc:
-	@cd ${.CURDIR}/etc; make upgrade_etc
+	@cd ${.CURDIR}/etc; MAKEFLAGS="-m ${.CURDIR}/share/mk" make upgrade_etc

 #
 # Convenient targets for use by the CVS repository meister.





More information about the Submit mailing list