further refine the upgrade process.

2 files changed, 3 insertions, 21 deletions

diff --git a/Makefile.inc1 b/Makefile.inc1
index 8ba72e1..82c1deb 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.inc1,v 1.59 1999/01/20 05:45:57 markm Exp $
+#	$Id: Makefile.inc1,v 1.61 1999/01/23 08:44:17 markm Exp $
 #
 # Make command line options:
 #	-DCLOBBER will remove /usr/include
@@ -363,7 +363,7 @@ reinstall:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Re-scanning the shared libraries.."
 	@echo "--------------------------------------------------------------"
-	cd ${.CURDIR}; /sbin/ldconfig -R
+	-cd ${.CURDIR}; /sbin/ldconfig -R
 .endif
 	@echo
 	@echo "--------------------------------------------------------------"
diff --git a/Makefile.upgrade b/Makefile.upgrade
index 62d98f3..8eed5b4 100644
--- a/Makefile.upgrade
+++ b/Makefile.upgrade
@@ -1,5 +1,5 @@
 #
-#	$Id: Makefile.upgrade,v 1.11 1999/01/26 09:12:21 jkh Exp $
+#	$Id: Makefile.upgrade,v 1.12 1999/01/27 08:49:53 jkh Exp $
 #
 # This makefile contains rules for preforming upgrades that are outside
 # the scope of the normal build world process.
@@ -165,15 +165,6 @@ ${MAKEOBJDIRPREFIX}/do_move_aout_libs move-aout-libs :
 # elf world will be updated.
 #
 ${MAKEOBJDIRPREFIX}/do_aout_installworld :
-.if !defined(NOCONFIRM)
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " You are about to update the installed system (or the system"
-	@echo " that your DESTDIR points to). You can type Ctrl-C to abort"
-	@echo " now or press return to start the first phase of the update."
-	@echo "--------------------------------------------------------------"
-	@/bin/sh -c "read -p \"Return to continue or Ctrl-C to abort: \" _e"
-.endif
 .if	${INSTALLEDVERSION} < 300003
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -182,15 +173,6 @@ ${MAKEOBJDIRPREFIX}/do_aout_installworld :
 	@cp /bin/sh ${MAKEOBJDIRPREFIX}
 	@cp /sbin/reboot ${MAKEOBJDIRPREFIX}
 .endif
-	@echo
-	@echo "--------------------------------------------------------------"
-	@echo " Doing an aout installworld using the aout tools in the aout"
-	@echo " obj tree."
-	@echo "--------------------------------------------------------------"
-	@cd ${.CURDIR}; MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/aout \
-		PATH=${AOUTTMPPATH} OBJFORMAT=aout NOTOOLS=1 \
-		TOOLROOT=${MAKEOBJDIRPREFIX}/aout${.CURDIR}/tmp \
-		make -f Makefile.inc1 -m ${.CURDIR}/share/mk installworld
 	@touch ${MAKEOBJDIRPREFIX}/do_aout_installworld
 
 #