diff --git a/mozilla/tools/codesighs/autosummary.linux.bash b/mozilla/tools/codesighs/autosummary.linux.bash
index 3cb68d40761..5f6b33e61f0 100755
--- a/mozilla/tools/codesighs/autosummary.linux.bash
+++ b/mozilla/tools/codesighs/autosummary.linux.bash
@@ -106,21 +106,20 @@ SUMMARYFILE="$3"
 #
 #   Create our temporary directory.
 #
-TMPDIR="codesighs/$PPID"
-mkdir -p $TMPDIR
+MYTMPDIR=`mktemp -d ./codesighs.tmp.XXXXXXXX`
 
 
 #
 #   Find all relevant files.
 #
-ALLFILES="$TMPDIR/allfiles.list"
+ALLFILES="$MYTMPDIR/allfiles.list"
 find ./mozilla/dist/bin -not -type d $EXCLUDE_NAMES > $ALLFILES
 
 
 #
 #   Reduce the files to a revelant set.
 #
-THEFILES="$TMPDIR/files.list"
+THEFILES="$MYTMPDIR/files.list"
 grep -vi $EXCLUDE_PATTERN_01 < $ALLFILES | grep -vi $EXCLUDE_PATTERN_02 > $THEFILES
 
 
@@ -129,14 +128,14 @@ grep -vi $EXCLUDE_PATTERN_01 < $ALLFILES | grep -vi $EXCLUDE_PATTERN_02 > $THEFI
 #   We are very particular on what switches to use.
 #   nm --format=bsd --size-sort --print-file-name --demangle
 #
-NMRESULTS="$TMPDIR/nm.txt"
+NMRESULTS="$MYTMPDIR/nm.txt"
 xargs -n 1 nm --format=bsd --size-sort --print-file-name --demangle < $THEFILES > $NMRESULTS 2> /dev/null
 
 
 #
 #   Produce the TSV output.
 #
-RAWTSVFILE="$TMPDIR/raw.tsv"
+RAWTSVFILE="$MYTMPDIR/raw.tsv"
 ./mozilla/dist/bin/nm2tsv --input $NMRESULTS > $RAWTSVFILE
 
 
@@ -152,7 +151,7 @@ sort -r $RAWTSVFILE > $COPYSORTTSV
 #       level report.
 #
 rm -f $SUMMARYFILE
-DIFFFILE="$TMPDIR/diff.txt"
+DIFFFILE="$MYTMPDIR/diff.txt"
 if [ -e $OLDTSVFILE ]; then
   diff $OLDTSVFILE $COPYSORTTSV > $DIFFFILE
   ./mozilla/dist/bin/maptsvdifftool --input $DIFFFILE >> $SUMMARYFILE
@@ -190,4 +189,4 @@ fi
 #
 #   Remove our temporary directory.
 #
-\rm -rf $TMPDIR
+\rm -rf $MYTMPDIR
diff --git a/mozilla/tools/codesighs/autosummary.win.bash b/mozilla/tools/codesighs/autosummary.win.bash
index 9b21be46411..7e1a097e3f3 100755
--- a/mozilla/tools/codesighs/autosummary.win.bash
+++ b/mozilla/tools/codesighs/autosummary.win.bash
@@ -102,30 +102,29 @@ SUMMARYFILE="$3"
 #
 #   Create our temporary directory.
 #
-TMPDIR="$TMP/codesighs.$PPID"
-mkdir -p $TMPDIR
+MYTMPDIR=`mktemp -d ./codesighs.tmp.XXXXXXXX`
 
 
 #
 #   Find all map files.
 #
-ALLMAPSFILE="$TMPDIR/allmaps.list"
+ALLMAPSFILE="$MYTMPDIR/allmaps.list"
 find ./mozilla -type f -name *.map > $ALLMAPSFILE
 
 
 #
 #   Reduce the map files to a revelant set.
 #
-NOPATMAPSFILE="$TMPDIR/nopatmaps.list"
+NOPATMAPSFILE="$MYTMPDIR/nopatmaps.list"
 grep -vi $EXCLUDE_PATTERN_01 < $ALLMAPSFILE | grep -vi $EXCLUDE_PATTERN_02 | grep -vi $EXCLUDE_PATTERN_03 | grep -vi $EXCLUDE_PATTERN_04 > $NOPATMAPSFILE
-MAPSFILE="$TMPDIR/maps.list"
+MAPSFILE="$MYTMPDIR/maps.list"
 grep -vi $EXCLUDE_NAME_01 < $NOPATMAPSFILE | grep -vi $EXCLUDE_NAME_02 > $MAPSFILE
 
 
 #
 #   Produce the TSV output.
 #
-RAWTSVFILE="$TMPDIR/raw.tsv"
+RAWTSVFILE="$MYTMPDIR/raw.tsv"
 xargs -n 1 ./mozilla/dist/bin/msmap2tsv --input < $MAPSFILE > $RAWTSVFILE
 
 
@@ -141,7 +140,7 @@ sort -r $RAWTSVFILE > $COPYSORTTSV
 #       level report.
 #
 rm -f $SUMMARYFILE
-DIFFFILE="$TMPDIR/diff.txt"
+DIFFFILE="$MYTMPDIR/diff.txt"
 if [ -e $OLDTSVFILE ]; then
   diff $OLDTSVFILE $COPYSORTTSV > $DIFFFILE
   ./mozilla/dist/bin/maptsvdifftool --input $DIFFFILE >> $SUMMARYFILE
@@ -171,4 +170,4 @@ fi
 #
 #   Remove our temporary directory.
 #
-rm -rf $TMPDIR
+rm -rf $MYTMPDIR