svn commit: r278539 - projects/release-pkg/etc
Baptiste Daroussin
bapt at FreeBSD.org
Tue Feb 10 22:04:42 UTC 2015
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 | " \
More information about the svn-src-projects
mailing list