Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Jun 2007 17:23:27 GMT
From:      Gabor Kovesdan <gabor@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 122102 for review
Message-ID:  <200706211723.l5LHNRfI035654@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122102

Change 122102 by gabor@gabor_server on 2007/06/21 17:22:52

	- Revert an accidentally submitted change
	- Use .TARGETS to pass the needed targets to the DESTDIR environment

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#20 edit

Differences ...

==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#20 (text+ko) ====

@@ -1093,14 +1093,10 @@
 # DESTDIR section to start a chrooted process if incoked with DESTDIR set
 #
 
-DESTDIR_LOCKFILE?=	/var/tmp/destdir.lock
-
-.if defined(DESTDIR) && !empty(DESTDIR) && !exists(${DESTDIR_LOCKFILE})
-_TARGET:=	${.TARGET}
+.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED)
 .BEGIN:
 	${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \
-	${TOUCH} ${DESTDIR}${DESTDIR_LOCKFILE}
-	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} CHROOTED=YES ${_TARGET})"
+	${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})"
 .else
 
 # Look for ${WRKSRC}/.../*.orig files, and (re-)create



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706211723.l5LHNRfI035654>