Fix the `make -jX' (X>1) breakage.

Based on patch submitted by:	Makoto MATSUSHITA <matusita@jp.freebsd.org>
Reviewed by:	marcel, bde

5 files changed, 55 insertions, 45 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index d045c07..3a8b051 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -252,7 +252,7 @@ links:
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
+	sh makelinks; rm -f dontlink
 
 kernel-tags:
 	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
@@ -310,29 +310,31 @@ MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} all
 
 modules-depend:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} depend
 
 modules-clean:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean
 
 modules-cleandepend:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend
 
 modules-cleandir:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir
 
 modules-tags:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags
 
 modules-install modules-install.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 modules-reinstall modules-reinstall.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 config.o:
 	${NORMAL_C}
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 369dd4d..512eaab 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -212,7 +212,7 @@ links:
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
+	sh makelinks; rm -f dontlink
 
 kernel-tags:
 	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
@@ -271,29 +271,31 @@ MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} all
 
 modules-depend:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} depend
 
 modules-clean:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean
 
 modules-cleandepend:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend
 
 modules-cleandir:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir
 
 modules-tags:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags
 
 modules-install modules-install.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 modules-reinstall modules-reinstall.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 config.o:
 	${NORMAL_C}
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index ebd1526..f114cde 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -217,7 +217,7 @@ links:
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
+	sh makelinks; rm -f dontlink
 
 kernel-tags:
 	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
@@ -275,29 +275,31 @@ MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} all
 
 modules-depend:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} depend
 
 modules-clean:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean
 
 modules-cleandepend:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend
 
 modules-cleandir:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir
 
 modules-tags:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags
 
 modules-install modules-install.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 modules-reinstall modules-reinstall.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 config.o:
 	${NORMAL_C}
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 7961d3a..f2bd145 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -215,7 +215,7 @@ links:
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
+	sh makelinks; rm -f dontlink
 
 kernel-tags:
 	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
@@ -274,29 +274,31 @@ MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} all
 
 modules-depend:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} depend
 
 modules-clean:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean
 
 modules-cleandepend:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend
 
 modules-cleandir:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir
 
 modules-tags:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags
 
 modules-install modules-install.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 modules-reinstall modules-reinstall.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 config.o:
 	${NORMAL_C}
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 369dd4d..512eaab 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -212,7 +212,7 @@ links:
 	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
 	  sort -u | comm -23 - dontlink | \
 	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
+	sh makelinks; rm -f dontlink
 
 kernel-tags:
 	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
@@ -271,29 +271,31 @@ MKMODULESENV=	MAKEOBJDIRPREFIX=${.OBJDIR}/modules KMODDIR=${KODIR}
 
 modules:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj all
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} all
 
 modules-depend:
 	@mkdir -p ${.OBJDIR}/modules
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} obj depend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} obj ; \
+	    env ${MKMODULESENV} ${MAKE} depend
 
 modules-clean:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} clean
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} clean
 
 modules-cleandepend:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandepend
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandepend
 
 modules-cleandir:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} cleandir
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} cleandir
 
 modules-tags:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} tags
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} tags
 
 modules-install modules-install.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 modules-reinstall modules-reinstall.debug:
-	cd $S/modules && env ${MKMODULESENV} ${MAKE} install
+	cd $S/modules ; env ${MKMODULESENV} ${MAKE} install
 
 config.o:
 	${NORMAL_C}