Module Name: src
Committed By: tsutsui
Date: Sun Mar 22 08:43:54 UTC 2009
Modified Files:
src/distrib/cdrom: Makefile
Log Message:
Don't remove ${DISTRIBDIR} on cleandir if it isn't default.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/distrib/cdrom/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.44 src/distrib/cdrom/Makefile:1.45
--- src/distrib/cdrom/Makefile:1.44 Sun Mar 22 08:22:37 2009
+++ src/distrib/cdrom/Makefile Sun Mar 22 08:43:54 2009
@@ -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
# not edited for basic configuration changes.
@@ -132,7 +132,8 @@
RSYNC_ARGS?= -va --delete
RSYNC_EXCLUDE+= --exclude=/* --exclude=Split --exclude=cdrom
-DISTRIBDIR?= ${.OBJDIR}/download
+DOWNLOADDIR?= ${.OBJDIR}/download
+DISTRIBDIR?= ${DOWNLOADDIR}
STAGEDIR?= ${.OBJDIR}/staging
IMAGEDIR?= ${.OBJDIR}
EXTFILEDIR?= ${.OBJDIR}/extfiles
@@ -516,7 +517,7 @@
${RSYNC} ${RSYNC_INCLUDE} ${RSYNC_ARGS} ${RSYNC_EXCLUDE} ${RSYNC_SITE}/ ${DISTRIBDIR}/
clean: cleanstagedir cleanimages
-cleandir distclean: cleandistribdir
+cleandir distclean: cleandownloaddir
cleanimages:
.for image in ${CD_IMAGES}
@@ -527,5 +528,5 @@
cleanstagedir:
-rm -rf ${STAGEDIR} ${EXTFILEDIR}
-cleandistribdir:
- -rm -rf ${DISTRIBDIR}
+cleandownloaddir:
+ -rm -rf ${DOWNLOADDIR}
