From dfea516de214fa01c1f005a8360df6007ac8a000 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 19 Jan 2001 19:43:45 +0000 Subject: Change the reinstall.debug target to depend on {kernel,modules}-reinstall.debug rather than {kernel,modules}-reinstall. Otherwise, the '.debug' portion of the target is lost, and you end up reinstalling the non debug version instead of the debug version. --- sys/conf/Makefile.alpha | 12 ++++++++---- sys/conf/Makefile.i386 | 12 ++++++++---- sys/conf/Makefile.ia64 | 12 ++++++++---- sys/conf/Makefile.pc98 | 12 ++++++++---- sys/conf/Makefile.powerpc | 12 ++++++++---- 5 files changed, 40 insertions(+), 20 deletions(-) diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha index ca1c3df16634..bc749955a890 100644 --- a/sys/conf/Makefile.alpha +++ b/sys/conf/Makefile.alpha @@ -115,8 +115,10 @@ depend: kernel-depend clean: kernel-clean cleandepend: kernel-cleandepend tags: kernel-tags -install install.debug: kernel-install -reinstall reinstall.debug: kernel-reinstall +install: kernel-install +install.debug: kernel-install.debug +reinstall: kernel-reinstall +reinstall.debug: kernel-reinstall.debug .if !defined(DEBUG) FULLKERNEL= ${KERNEL_KO} @@ -302,8 +304,10 @@ depend: modules-depend clean: modules-clean cleandepend: modules-cleandepend tags: modules-tags -install install.debug: modules-install -reinstall reinstall.debug: modules-reinstall +install: modules-install +install.debug: modules-install.debug +reinstall: modules-reinstall +reinstall.debug: modules-reinstall.debug .endif MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index cb19235d5d3b..135c8683511e 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -120,8 +120,10 @@ depend: kernel-depend clean: kernel-clean cleandepend: kernel-cleandepend tags: kernel-tags -install install.debug: kernel-install -reinstall reinstall.debug: kernel-reinstall +install: kernel-install +install.debug: kernel-install.debug +reinstall: kernel-reinstall +reinstall.debug: kernel-reinstall.debug .if !defined(DEBUG) FULLKERNEL= ${KERNEL_KO} @@ -263,8 +265,10 @@ clean: modules-clean cleandepend: modules-cleandepend cleandir: modules-cleandir tags: modules-tags -install install.debug: modules-install -reinstall reinstall.debug: modules-reinstall +install: modules-install +install.debug: modules-install.debug +reinstall: modules-reinstall +reinstall.debug: modules-reinstall.debug .endif MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64 index ec18008a8683..0739aa9caf93 100644 --- a/sys/conf/Makefile.ia64 +++ b/sys/conf/Makefile.ia64 @@ -128,8 +128,10 @@ depend: kernel-depend clean: kernel-clean cleandepend: kernel-cleandepend tags: kernel-tags -install install.debug: kernel-install -reinstall reinstall.debug: kernel-reinstall +install: kernel-install +install.debug: kernel-install.debug +reinstall: kernel-reinstall +reinstall.debug: kernel-reinstall.debug .if !defined(DEBUG) FULLKERNEL= ${KERNEL_KO} @@ -265,8 +267,10 @@ clean: modules-clean cleandepend: modules-cleandepend cleandir: modules-cleandir tags: modules-tags -install install.debug: modules-install -reinstall reinstall.debug: modules-reinstall +install: modules-install +install.debug: modules-install.debug +reinstall: modules-reinstall +reinstall.debug: modules-reinstall.debug .endif MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98 index 546853f07bd3..7aef2a297ea5 100644 --- a/sys/conf/Makefile.pc98 +++ b/sys/conf/Makefile.pc98 @@ -122,8 +122,10 @@ depend: kernel-depend clean: kernel-clean cleandepend: kernel-cleandepend tags: kernel-tags -install install.debug: kernel-install -reinstall reinstall.debug: kernel-reinstall +install: kernel-install +install.debug: kernel-install.debug +reinstall: kernel-reinstall +reinstall.debug: kernel-reinstall.debug .if !defined(DEBUG) FULLKERNEL= ${KERNEL_KO} @@ -266,8 +268,10 @@ clean: modules-clean cleandepend: modules-cleandepend cleandir: modules-cleandir tags: modules-tags -install install.debug: modules-install -reinstall reinstall.debug: modules-reinstall +install: modules-install +install.debug: modules-install.debug +reinstall: modules-reinstall +reinstall.debug: modules-reinstall.debug .endif MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index cb19235d5d3b..135c8683511e 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -120,8 +120,10 @@ depend: kernel-depend clean: kernel-clean cleandepend: kernel-cleandepend tags: kernel-tags -install install.debug: kernel-install -reinstall reinstall.debug: kernel-reinstall +install: kernel-install +install.debug: kernel-install.debug +reinstall: kernel-reinstall +reinstall.debug: kernel-reinstall.debug .if !defined(DEBUG) FULLKERNEL= ${KERNEL_KO} @@ -263,8 +265,10 @@ clean: modules-clean cleandepend: modules-cleandepend cleandir: modules-cleandir tags: modules-tags -install install.debug: modules-install -reinstall reinstall.debug: modules-reinstall +install: modules-install +install.debug: modules-install.debug +reinstall: modules-reinstall +reinstall.debug: modules-reinstall.debug .endif MKMODULESENV= MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR} -- cgit v1.3