diff options
author | David E. O'Brien <obrien@FreeBSD.org> | 2000-09-07 00:26:33 +0000 |
---|---|---|
committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-09-07 00:26:33 +0000 |
commit | 39f7b60e361a4a288a563e6360b6c7e5786c8fa6 (patch) | |
tree | 7bb24f44645b48563961f494e10dc45e979d15a8 | |
parent | 9bb715b7fd3e8320ff38875f8b508c3af25d6267 (diff) | |
download | src-39f7b60e361a4a288a563e6360b6c7e5786c8fa6.tar.gz src-39f7b60e361a4a288a563e6360b6c7e5786c8fa6.zip |
Remove superfluous `/'s before KODIR.
Acceptability explained by: rgrimes
Notes
Notes:
svn path=/head/; revision=65554
-rw-r--r-- | sys/conf/Makefile.alpha | 26 | ||||
-rw-r--r-- | sys/conf/Makefile.i386 | 26 | ||||
-rw-r--r-- | sys/conf/Makefile.pc98 | 24 | ||||
-rw-r--r-- | sys/conf/Makefile.powerpc | 26 |
4 files changed, 51 insertions, 51 deletions
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index 879feb28d705..fc14845206f4 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -273,26 +273,26 @@ kernel-install kernel-install.debug: echo "You must build a kernel first." ; \ exit 1 ; \ fi -.if exists(${DESTDIR}/${KODIR}) -.if exists(${DESTDIR}/${KODIR}.old) - @-chflags -R noschg ${DESTDIR}/${KODIR}.old - -rm -rf ${DESTDIR}/${KODIR}.old +.if exists(${DESTDIR}${KODIR}) +.if exists(${DESTDIR}${KODIR}.old) + @-chflags -R noschg ${DESTDIR}${KODIR}.old + -rm -rf ${DESTDIR}${KODIR}.old .endif - mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old + mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old .endif - mkdir -p ${DESTDIR}/${KODIR} - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + mkdir -p ${DESTDIR}${KODIR} + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR} + ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR} kernel-reinstall kernel-reinstall.debug: - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KODIR} + ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR} .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) all: modules @@ -304,7 +304,7 @@ install install.debug: modules-install reinstall reinstall.debug: modules-reinstall .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR} +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR} modules: @mkdir -p ${.OBJDIR}/modules diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index c871f52773b3..1c04ff6beac8 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -228,26 +228,26 @@ kernel-install kernel-install.debug: echo "You must build a kernel first." ; \ exit 1 ; \ fi -.if exists(${DESTDIR}/${KODIR}) -.if exists(${DESTDIR}/${KODIR}.old) - @-chflags -R noschg ${DESTDIR}/${KODIR}.old - -rm -rf ${DESTDIR}/${KODIR}.old +.if exists(${DESTDIR}${KODIR}) +.if exists(${DESTDIR}${KODIR}.old) + @-chflags -R noschg ${DESTDIR}${KODIR}.old + -rm -rf ${DESTDIR}${KODIR}.old .endif - mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old + mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old .endif - mkdir -p ${DESTDIR}/${KODIR} - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + mkdir -p ${DESTDIR}${KODIR} + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR} + ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR} kernel-reinstall kernel-reinstall.debug: - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KODIR} + ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR} .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) all: modules @@ -260,7 +260,7 @@ install install.debug: modules-install reinstall reinstall.debug: modules-reinstall .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR} +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR} modules: @mkdir -p ${.OBJDIR}/modules diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 0d93180819a9..78f4429dbf9e 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -231,23 +231,23 @@ kernel-install kernel-install.debug: echo "You must build a kernel first." ; \ exit 1 ; \ fi -.if exists(${DESTDIR}/${KODIR}) -.if exists(${DESTDIR}/${KODIR}.old) - @-chflags -R noschg ${DESTDIR}/${KODIR}.old - -rm -rf ${DESTDIR}/${KODIR}.old +.if exists(${DESTDIR}${KODIR}) +.if exists(${DESTDIR}${KODIR}.old) + @-chflags -R noschg ${DESTDIR}${KODIR}.old + -rm -rf ${DESTDIR}${KODIR}.old .endif - mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old + mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old .endif - mkdir -p ${DESTDIR}/${KODIR} - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + mkdir -p ${DESTDIR}${KODIR} + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR} + ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR} kernel-reinstall kernel-reinstall.debug: - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ ${KERNEL}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KERNEL} @@ -263,7 +263,7 @@ install install.debug: modules-install reinstall reinstall.debug: modules-reinstall .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR} +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR} modules: @mkdir -p ${.OBJDIR}/modules diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index c871f52773b3..1c04ff6beac8 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -228,26 +228,26 @@ kernel-install kernel-install.debug: echo "You must build a kernel first." ; \ exit 1 ; \ fi -.if exists(${DESTDIR}/${KODIR}) -.if exists(${DESTDIR}/${KODIR}.old) - @-chflags -R noschg ${DESTDIR}/${KODIR}.old - -rm -rf ${DESTDIR}/${KODIR}.old +.if exists(${DESTDIR}${KODIR}) +.if exists(${DESTDIR}${KODIR}.old) + @-chflags -R noschg ${DESTDIR}${KODIR}.old + -rm -rf ${DESTDIR}${KODIR}.old .endif - mv ${DESTDIR}/${KODIR} ${DESTDIR}/${KODIR}.old + mv ${DESTDIR}${KODIR} ${DESTDIR}${KODIR}.old .endif - mkdir -p ${DESTDIR}/${KODIR} - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + mkdir -p ${DESTDIR}${KODIR} + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}/${KODIR} + ${KERNEL_KO}${.TARGET:S/kernel-install//} ${DESTDIR}${KODIR} kernel-reinstall kernel-reinstall.debug: - @if [ -f ${DESTDIR}/${KODIR}/${KERNEL_KO} ] ; then \ - chflags noschg ${DESTDIR}/${KODIR}/${KERNEL_KO} ; \ + @if [ -f ${DESTDIR}${KODIR}/${KERNEL_KO} ] ; then \ + chflags noschg ${DESTDIR}${KODIR}/${KERNEL_KO} ; \ fi install -c -m 555 -o root -g wheel -fschg \ - ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}/${KODIR} + ${KERNEL_KO}${.TARGET:S/kernel-reinstall//} ${DESTDIR}${KODIR} .if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists($S/modules) all: modules @@ -260,7 +260,7 @@ install install.debug: modules-install reinstall reinstall.debug: modules-reinstall .endif -MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}/${KODIR} +MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${DESTDIR}${KODIR} modules: @mkdir -p ${.OBJDIR}/modules |