diff options
| author | brooks <brooks@FreeBSD.org> | 2013-05-30 14:09:58 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2013-05-30 14:09:58 +0000 |
| commit | 064e79f7c35044b9adcff847107465462b5352e9 (patch) | |
| tree | aed193f378ab022e35a7ac12504d78b740724c15 /Makefile.inc1 | |
| parent | f8c8cdb1f0ad6e4ded054e34e583cd6c7ae38e99 (diff) | |
| download | FreeBSD-src-064e79f7c35044b9adcff847107465462b5352e9.zip FreeBSD-src-064e79f7c35044b9adcff847107465462b5352e9.tar.gz | |
Always define INSTALL_DDIR and define it such that it contains no extra
/ characters rather than removing them later on. This should fix
release builds.
PR: conf/178963
Reviewed by: gjb, hrs
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index da4d993..28ecdc8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -407,11 +407,12 @@ IMAKEENV+= PATH=${TMPPATH}:${INSTALLTMP} INSTALLFLAGS+= -N ${.CURDIR}/etc MTREEFLAGS+= -N ${.CURDIR}/etc .endif +_INSTALL_DDIR= ${DESTDIR}/${DISTDIR} +INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::} .if defined(NO_ROOT) METALOG?= ${DESTDIR}/${DISTDIR}/METALOG IMAKE+= -DNO_ROOT METALOG=${METALOG} -INSTALL_DDIR= ${DESTDIR}/${DISTDIR} -INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g:C:/$::} +INSTALLFLAGS+= -U -M ${METALOG} -D ${INSTALL_DDIR} MTREEFLAGS+= -W .endif .if defined(DB_FROM_SRC) || defined(NO_ROOT) @@ -522,7 +523,7 @@ _includes: @echo "--------------------------------------------------------------" @echo ">>> stage 4.1: building includes" @echo "--------------------------------------------------------------" - ${_+_}cd ${.CURDIR}; ${WMAKE} SHARED=symlinks par-includes + ${_+_}cd ${.CURDIR}; ${WMAKE} par-includes _libraries: @echo @echo "--------------------------------------------------------------" @@ -1014,7 +1015,7 @@ distributekernel distributekernel.debug: cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \ ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.premeta/} \ ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} KERNEL=${INSTKERNNAME} \ - DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel \ + DESTDIR=${INSTALL_DDIR}/kernel \ ${.TARGET:S/distributekernel/install/} .if defined(NO_ROOT) sed -e 's|^./kernel|.|' ${DESTDIR}/${DISTDIR}/kernel.premeta > \ @@ -1028,7 +1029,7 @@ distributekernel distributekernel.debug: ${IMAKEENV} ${IMAKE_INSTALL:S/METALOG/kernel.${_kernel}.premeta/} \ ${IMAKE_MTREE} PATH=${TMPPATH} ${MAKE} \ KERNEL=${INSTKERNNAME}.${_kernel} \ - DESTDIR=${INSTALL_DDIR:S://:/:g:C:/$::}/kernel.${_kernel} \ + DESTDIR=${INSTALL_DDIR}/kernel.${_kernel} \ ${.TARGET:S/distributekernel/install/} sed -e 's|^./kernel|.|' \ ${DESTDIR}/${DISTDIR}/kernel.${_kernel}.premeta > \ |
