diff options
| author | jhb <jhb@FreeBSD.org> | 2001-01-17 07:13:40 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2001-01-17 07:13:40 +0000 |
| commit | ef2b685ba100e15376ac7b1c2ab5aeeecd97c4bc (patch) | |
| tree | b3ed712d4fe70e00e5235edfe4b4ded53ee9413c | |
| parent | dd438a218a1cb08a9cc17520c5f661df2f000e17 (diff) | |
| download | FreeBSD-src-ef2b685ba100e15376ac7b1c2ab5aeeecd97c4bc.zip FreeBSD-src-ef2b685ba100e15376ac7b1c2ab5aeeecd97c4bc.tar.gz | |
- sysinstall now gets built as part of world, so don't throw in extra
commands to build sysinstall manually during release.
- Get the sysinstall help files from /usr/src/usr.sbin/sysinstall/help
rather than ${.CURDIR}/sysinstall/help.
| -rw-r--r-- | release/Makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/release/Makefile b/release/Makefile index 76666b4..f34b293 100644 --- a/release/Makefile +++ b/release/Makefile @@ -317,8 +317,6 @@ rerelease release: .endif echo " touch /tmp/.world_done" >> ${CHROOTDIR}/mk echo "fi" >> ${CHROOTDIR}/mk - echo "cd /usr/src/release/sysinstall" >> ${CHROOTDIR}/mk - echo "make obj" >> ${CHROOTDIR}/mk echo "cd /usr/src/release" >> ${CHROOTDIR}/mk echo "make \$${_RELTARGET}" >> ${CHROOTDIR}/mk echo "echo \">>> make ${.TARGET} finished on \`LC_TIME=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk @@ -399,7 +397,6 @@ release.3: # See /usr/src/bin/ls/Makefile. release.4: @mkdir -p /stand - cd ${.CURDIR}/sysinstall && make obj depend all install rm -rf ${RD}/crunch mkdir -p ${RD}/crunch export RELEASE_BUILD_FIXIT=noway ; \ @@ -555,7 +552,7 @@ release.8: write_mfs_in_kernel @cd ${.CURDIR} && ${MAKE} doMODULES KERNEL=BOOTMFS KERNEL_KO=BOOTMFS KODIR="" .endif @echo "Making the regular boot floppy." - @tar --exclude CVS -cf - -C ${.CURDIR}/sysinstall help | \ + @tar --exclude CVS -cf - -C /usr/src/usr.sbin/sysinstall help | \ tar xf - -C ${RD}/mfsfd/stand @echo "Compressing doc files..." @gzip -9 ${RD}/mfsfd/stand/help/*.hlp |
