FreeBSD Bugzilla – Attachment 173260 Details for
Bug 211564
distributeworld (and other distribuction functions) failing for custom DESTDIR
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Enforce the use of ${DESTDIR} during world distribution.
base.HEAD.r303717.patch (text/plain), 1.77 KB, created by
VinÃcius Zavam
on 2016-08-04 01:48:16 UTC
(
hide
)
Description:
Enforce the use of ${DESTDIR} during world distribution.
Filename:
MIME Type:
Creator:
VinÃcius Zavam
Created:
2016-08-04 01:48:16 UTC
Size:
1.77 KB
patch
obsolete
>Index: Makefile.inc1 >=================================================================== >--- Makefile.inc1 (revision 303717) >+++ Makefile.inc1 (working copy) >@@ -1006,7 +1006,7 @@ > -mkdir ${DESTDIR}/${DISTDIR}/base > ${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \ > METALOG=${METALOG} ${IMAKE_INSTALL} ${IMAKE_MTREE} \ >- DISTBASE=/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ >+ DISTBASE=${DESTDIR}/base DESTDIR=${DESTDIR}/${DISTDIR}/base \ > LOCAL_MTREE=${LOCAL_MTREE:Q} distrib-dirs > .endif > ${_+_}cd ${.CURDIR}; ${IMAKE} re${.TARGET:S/world$//}; \ >Index: etc/Makefile >=================================================================== >--- etc/Makefile (revision 303717) >+++ etc/Makefile (working copy) >@@ -192,8 +192,8 @@ > # 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=${DISTDIR}/${DISTRIBUTION} >- ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION} >+ DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION} >+ ${_+_}cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DESTDIR}/${DISTDIR}/${DISTRIBUTION} > > .include <bsd.endian.mk> > .if ${TARGET_ENDIANNESS} == "1234" >Index: share/mk/bsd.subdir.mk >=================================================================== >--- share/mk/bsd.subdir.mk (revision 303717) >+++ share/mk/bsd.subdir.mk (working copy) >@@ -72,7 +72,7 @@ > distribute: .MAKE > .for dist in ${DISTRIBUTION} > ${_+_}cd ${.CURDIR}; \ >- ${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${DISTDIR}/${dist} SHARED=copies >+ ${MAKE} install installconfig -DNO_SUBDIR DESTDIR=${DESTDIR}/${DISTDIR}/${dist} SHARED=copies > .endfor > .endif > # Convenience targets to run 'build${target}' and 'install${target}' when
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 211564
:
173260
|
174857
|
177121