X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/blobdiff_plain/587547f94441d1f12dd8018598d2bc5d4aa1fbbb..5ffb2e13a2da96c424ee2204c5084e2c2db00659:/Makefile

diff --git a/Makefile b/Makefile
index 6cbffba1a6..86e8877466 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,6 @@
 # installkernel       - Install the kernel and the kernel-modules.
 # reinstallkernel     - Reinstall the kernel and the kernel-modules.
 # kernel              - buildkernel + installkernel.
-# update              - Convenient way to update your source tree (cvs).
 # preupgrade	      - Certain upgrades may have to be done before installworld.
 #			installworld will complain if they have not been done.  This
 #			target will do those upgrades... typically the addition of
@@ -63,7 +62,7 @@
 #
 # See src/UPDATING `COMMON ITEMS' for more complete information.
 #
-# If TARGET_ARCH=arch (e.g. amd64) is specified you can
+# If TARGET_ARCH=arch (e.g. x86_64) is specified you can
 # cross build world for other architectures using the buildworld target,
 # and once the world is built you can cross build a kernel using the
 # buildkernel target.
@@ -76,7 +75,7 @@ TGTS=	all all-man buildkernel quickkernel nativekernel \
 	cleandepend cleandir depend everything \
 	hierarchy install installcheck installkernel \
 	reinstallkernel installmost installworld libraries lint maninstall \
-	manlint mk most obj objlink regress rerelease tags update \
+	manlint mk most obj objlink regress rerelease tags \
 	_obj _includes _libraries _depend _worldtmp \
 	_bootstrap-tools _obj _build-tools _cross-tools
 
@@ -96,7 +95,7 @@ BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/}
 .ORDER: quickkernel installkernel
 .ORDER: quickkernel reinstallkernel
 
-PATH=	/sbin:/bin:/usr/sbin:/usr/bin
+PATH=	/sbin:/bin:/usr/sbin:/usr/bin:/usr/pkg/bin
 MAKE=	PATH=${PATH} make -m ${.CURDIR}/share/mk -f Makefile.inc1
 
 #
@@ -174,48 +173,15 @@ make:
 		make obj && make depend && make all && make install
 
 #
-# Handle the upgrade of /etc
+# Handle the upgrade of /etc, post-installworld updating of static files
+# and removing obsolete files.
 #
 
 preupgrade:
 	@cd ${.CURDIR}/etc; make -m ${.CURDIR}/share/mk preupgrade
 
-upgrade:	upgrade_etc
-
-#
-# Handle post-installworld updating of static files (e.g. like /etc/rc)
-#
-upgrade_etc:
+upgrade:
 	@cd ${.CURDIR}/etc; make -m ${.CURDIR}/share/mk upgrade_etc
-
-## Remove obsolete CVS commands, we are using GIT now.
-##
-## Convenient targets for use by the CVS repository meister.
-##
-#update_preview_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F DragonFly_Preview src
-#
-#update_release1_2_slip_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_2 DragonFly_RELEASE_1_2_Slip src
-#
-#update_release1_4_slip_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_4 DragonFly_RELEASE_1_4_Slip src
-#
-#update_release1_6_slip_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_6 DragonFly_RELEASE_1_6_Slip src
-#
-#update_release1_8_slip_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_8 DragonFly_RELEASE_1_8_Slip src
-#
-#update_release1_10_slip_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_10 DragonFly_RELEASE_1_10_Slip src
-#
-#update_release1_12_slip_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_1_12 DragonFly_RELEASE_1_12_Slip src
-#
-#update_release2_0_slip_tag:     iamoncrater
-#	cvs -d /cvs rtag -a -F -rDragonFly_RELEASE_2_0 DragonFly_RELEASE_2_0_Slip src
-
-iamoncrater:
-	@ [ "`hostname`" = "crater.dragonflybsd.org" ] || \
-		(echo "You are not on the master cvs host"; exit 1)
+.if !defined(NOMAN) && !defined(NO_MAKEDB_RUN)
+	cd ${.CURDIR}/share/man; make makedb
+.endif