Add an install target to release/Makefile instead of grubbing around

(and requesting that users grub around) in /usr/obj. Also make sure that
make clean removes the bootonly media and clean up that target a little.

2 files changed, 14 insertions, 11 deletions

diff --git a/release/Makefile b/release/Makefile
index 610d57a12537..477586152e0a 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -6,6 +6,7 @@
 #  cdrom: Builds release CD-ROM media (release.iso)
 #  ftp: Sets up FTP distribution area (ftp)
 #  release: Build all media and FTP distribution area
+#  install: Copies all release media into ${DESTDIR}
 #
 # Variables affecting the build process:
 #  WORLDDIR: location of src tree -- must have built world and default kernel
@@ -159,22 +160,26 @@ memstick: system
 
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	sh ${.CURDIR}/scripts/make-manifest.sh ${.OBJDIR}/*.txz > ${.OBJDIR}/MANIFEST
-	touch ${.OBJDIR}/${.TARGET}
+	touch ${.TARGET}
 
 cdrom: release.iso bootonly.iso
 ftp: packagesystem
-	rm -rf ${.OBJDIR}/ftp
-	mkdir ${.OBJDIR}/ftp
-	cp ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST ${.OBJDIR}/ftp
+	rm -rf ftp
+	mkdir ftp
+	cp *.txz MANIFEST ftp
 
 release: obj ${RELEASE_TARGETS}
 
 clean:
 	chflags -R noschg ${.OBJDIR}
-	rm -rf ${.OBJDIR}/dist ${.OBJDIR}/ftp
+	rm -rf dist ftp
 	rm -f packagesystem
-	rm -f ${.OBJDIR}/*.txz ${.OBJDIR}/MANIFEST
+	rm -f *.txz MANIFEST
 	rm -f system
-	rm -rf ${.OBJDIR}/release
-	rm -f ${.OBJDIR}/release.iso ${.OBJDIR}/memstick
+	rm -rf release bootonly
+	rm -f release.iso bootonly.iso memstick
+
+install:
+	-mkdir ${DESTDIR}
+	cp -a *.iso memstick ftp ${DESTDIR}/
 
diff --git a/release/generate-release.sh b/release/generate-release.sh
index 275a93de443e..01b3e2711b0f 100755
--- a/release/generate-release.sh
+++ b/release/generate-release.sh
@@ -60,7 +60,5 @@ if [ -d $2/usr/doc ]; then
 fi
 
 chroot $2 /bin/sh -c "cd /usr/src && make $MAKE_FLAGS buildworld buildkernel" || exit 1
-chroot $2 /bin/sh -c "cd /usr/src/release && make release" || exit 1
-mkdir $2/R
-cp -pRP $2/usr/obj/usr/src/release/*.iso $2/usr/obj/usr/src/release/memstick $2/usr/obj/usr/src/release/ftp $2/R
+chroot $2 /bin/sh -c "cd /usr/src/release && make release install DESTDIR=/R" || exit 1