build differently

1 files changed, 23 insertions, 39 deletions

diff --git a/distrib/sets/makesrctars b/distrib/sets/makesrctars
index ca776a18603..2e11ec00091 100644
--- a/distrib/sets/makesrctars
+++ b/distrib/sets/makesrctars
@@ -11,66 +11,50 @@ if [ -z "$SRCDIR" ]; then
 	exit 1
 fi
 
-if [ -z "$DESTDIR" ]; then
-	echo DESTDIR must be set
-	exit 1
-fi
-
-if [ -d ${DESTDIR} ]; then
-	echo "DESTDIR exists."
+if [ -z "$RELEASEDIR" ]; then
+	echo RELEASEDIR must be set
 	exit 1
 fi
 
 cd $SRCDIR
 
-mkdir ${DESTDIR}
-
-mkdir ${DESTDIR}/src${RELEASE}
+mkdir -p ${RELEASEDIR}/src${RELEASE}
 find . \
-    \! \( \( -path ./gnu -o -path ./share -o -path ./domestic \) -prune \) \
+    \! \( \( -path ./gnu -o -path ./share \) -prune \) \
     \! \( -path ./sys -prune \) \
     \! \( -path ./usr.sbin/config -prune \) \
     \! \( -path ./usr.sbin/config.old -prune \) \
     \! \( -path ./usr.sbin/dbsym -prune \) \
-    \! \( -name CVS -prune \) \! \( -name obj -prune \) -print | \
+    \! \( -name obj -prune \) -print | \
 	sort | pax -wv -d -s'|^./|./usr/src/|' | gzip -9 | \
-	split -b ${SPLITSIZE} - ${DESTDIR}/src${RELEASE}/src${RELEASE}.
-(cd ${DESTDIR}/src${RELEASE}; cksum src${RELEASE}.* > CKSUM; \
+	split -b ${SPLITSIZE} - ${RELEASEDIR}/src${RELEASE}/src${RELEASE}.
+(cd ${RELEASEDIR}/src${RELEASE}; cksum src${RELEASE}.* > CKSUM; \
 	md5 src${RELEASE}.* > MD5)
-chmod 444 ${DESTDIR}/src${RELEASE}/*
+chmod 444 ${RELEASEDIR}/src${RELEASE}/*
 
-mkdir ${DESTDIR}/gsrc${RELEASE}
+mkdir ${RELEASEDIR}/gsrc${RELEASE}
 find gnu \
-    \! \( -name CVS -prune \) \! \( -name obj -prune \) -print | \
+    \! \( -name obj -prune \) -print | \
 	sort | pax -wv -d -s'|^|./usr/src/|' | gzip -9 | \
-	split -b ${SPLITSIZE} - ${DESTDIR}/gsrc${RELEASE}/gsrc${RELEASE}.
-(cd ${DESTDIR}/gsrc${RELEASE}; cksum gsrc${RELEASE}.* > CKSUM; \
+	split -b ${SPLITSIZE} - ${RELEASEDIR}/gsrc${RELEASE}/gsrc${RELEASE}.
+(cd ${RELEASEDIR}/gsrc${RELEASE}; cksum gsrc${RELEASE}.* > CKSUM; \
 	md5 gsrc${RELEASE}.* > MD5)
-chmod 444 ${DESTDIR}/gsrc${RELEASE}/*
+chmod 444 ${RELEASEDIR}/gsrc${RELEASE}/*
 
-mkdir ${DESTDIR}/ksrc${RELEASE}
+mkdir ${RELEASEDIR}/ksrc${RELEASE}
 find sys usr.sbin/config usr.sbin/config.old usr.sbin/dbsym \
-    \! \( -name CVS -prune \) \! \( -name obj -prune \) -print | \
+    \! \( -name obj -prune \) -print | \
 	sort | pax -wv -d -s'|^|./usr/src/|' | gzip -9 | \
-	split -b ${SPLITSIZE} - ${DESTDIR}/ksrc${RELEASE}/ksrc${RELEASE}.
-(cd ${DESTDIR}/ksrc${RELEASE}; cksum ksrc${RELEASE}.* > CKSUM; \
+	split -b ${SPLITSIZE} - ${RELEASEDIR}/ksrc${RELEASE}/ksrc${RELEASE}.
+(cd ${RELEASEDIR}/ksrc${RELEASE}; cksum ksrc${RELEASE}.* > CKSUM; \
 	md5 ksrc${RELEASE}.* > MD5)
-chmod 444 ${DESTDIR}/ksrc${RELEASE}/*
+chmod 444 ${RELEASEDIR}/ksrc${RELEASE}/*
 
-mkdir ${DESTDIR}/ssrc${RELEASE}
+mkdir ${RELEASEDIR}/ssrc${RELEASE}
 find share \
-    \! \( -name CVS -prune \) \! \( -name obj -prune \) -print | \
+    \! \( -name obj -prune \) -print | \
 	sort | pax -wv -d -s'|^|./usr/src/|' | gzip -9 | \
-	split -b ${SPLITSIZE} - ${DESTDIR}/ssrc${RELEASE}/ssrc${RELEASE}.
-(cd ${DESTDIR}/ssrc${RELEASE}; cksum ssrc${RELEASE}.* > CKSUM; \
+	split -b ${SPLITSIZE} - ${RELEASEDIR}/ssrc${RELEASE}/ssrc${RELEASE}.
+(cd ${RELEASEDIR}/ssrc${RELEASE}; cksum ssrc${RELEASE}.* > CKSUM; \
 	md5 ssrc${RELEASE}.* > MD5)
-chmod 444 ${DESTDIR}/ssrc${RELEASE}/*
-
-mkdir ${DESTDIR}/dsrc${RELEASE}
-find domestic \
-    \! \( -name CVS -prune \) \! \( -name obj -prune \) -print | \
-	sort | pax -wv -d -s'|^|./usr/src/|' | gzip -9 | \
-	split -b ${SPLITSIZE} - ${DESTDIR}/dsrc${RELEASE}/dsrc${RELEASE}.
-(cd ${DESTDIR}/dsrc${RELEASE}; cksum dsrc${RELEASE}.* > CKSUM; \
-	md5 dsrc${RELEASE}.* > MD5)
-chmod 444 ${DESTDIR}/dsrc${RELEASE}/*
+chmod 444 ${RELEASEDIR}/ssrc${RELEASE}/*