Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't remove ${DISTRIBDIR} on cleandir if it isn't default.

Browse Source
This commit is contained in:
tsutsui 2009-03-22 08:43:54 +00:00
parent f71b3da7ab
commit 24d0b20cba
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
distrib/cdrom/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.44 2009/03/22 08:22:37 tsutsui Exp $ # $NetBSD: Makefile,v 1.45 2009/03/22 08:43:54 tsutsui Exp $
# #
# Consult "*.conf" for the configuration variables; this Makefile is typically # Consult "*.conf" for the configuration variables; this Makefile is typically
# not edited for basic configuration changes. # not edited for basic configuration changes.
@ -132,7 +132,8 @@ RSYNC_SITE?= rsync://${RSYNC_HOST}${RSYNC_PATH}
RSYNC_ARGS?= -va --delete RSYNC_ARGS?= -va --delete
RSYNC_EXCLUDE+= --exclude=/* --exclude=Split --exclude=cdrom RSYNC_EXCLUDE+= --exclude=/* --exclude=Split --exclude=cdrom
DISTRIBDIR?= ${.OBJDIR}/download DOWNLOADDIR?= ${.OBJDIR}/download
DISTRIBDIR?= ${DOWNLOADDIR}
STAGEDIR?= ${.OBJDIR}/staging STAGEDIR?= ${.OBJDIR}/staging
IMAGEDIR?= ${.OBJDIR} IMAGEDIR?= ${.OBJDIR}
EXTFILEDIR?= ${.OBJDIR}/extfiles EXTFILEDIR?= ${.OBJDIR}/extfiles
@ -516,7 +517,7 @@ fetch: check_rsync
${RSYNC} ${RSYNC_INCLUDE} ${RSYNC_ARGS} ${RSYNC_EXCLUDE} ${RSYNC_SITE}/ ${DISTRIBDIR}/ ${RSYNC} ${RSYNC_INCLUDE} ${RSYNC_ARGS} ${RSYNC_EXCLUDE} ${RSYNC_SITE}/ ${DISTRIBDIR}/
clean: cleanstagedir cleanimages clean: cleanstagedir cleanimages
cleandir distclean: cleandistribdir cleandir distclean: cleandownloaddir
cleanimages: cleanimages:
.for image in ${CD_IMAGES} .for image in ${CD_IMAGES}
@ -527,5 +528,5 @@ cleanimages:
cleanstagedir: cleanstagedir:
-rm -rf ${STAGEDIR} ${EXTFILEDIR} -rm -rf ${STAGEDIR} ${EXTFILEDIR}
cleandistribdir: cleandownloaddir:
-rm -rf ${DISTRIBDIR} -rm -rf ${DOWNLOADDIR}