Date: Tue, 10 Feb 2015 22:04:41 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278539 - projects/release-pkg/etc Message-ID: <201502102204.t1AM4fxH050907@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Feb 10 22:04:41 2015 New Revision: 278539 URL: https://svnweb.freebsd.org/changeset/base/278539 Log: Revert r278451 and r278454 We won't use distributeworld in the end Modified: projects/release-pkg/etc/Makefile Modified: projects/release-pkg/etc/Makefile ============================================================================== --- projects/release-pkg/etc/Makefile Tue Feb 10 22:04:04 2015 (r278538) +++ projects/release-pkg/etc/Makefile Tue Feb 10 22:04:41 2015 (r278539) @@ -193,8 +193,8 @@ distribute: # Avoid installing tests here; "make distribution" will do this and # correctly place them in the right location. ${_+_}cd ${.CURDIR} ; ${MAKE} MK_TESTS=no install \ - DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION} - ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION} + DESTDIR=${DISTDIR}/${DISTRIBUTION} + ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} .include <bsd.endian.mk> .if ${TARGET_ENDIANNESS} == "1234" @@ -382,7 +382,7 @@ distrib-dirs: ${MTREES:N/*} shift; \ d=$$1; \ test "$$d" == "/" && d=""; \ - d=${DESTDIR}/${DISTBASE}$$d; \ + d=$d; \ shift; \ test -d $$d || mkdir -p $$d; \ ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502102204.t1AM4fxH050907>