Revert "WT-2842 split wtperf's configuration into per-database and per-run parts" (#3005)

1 files changed, 5 insertions, 8 deletions

diff --git a/dist/s_docs b/dist/s_docs
index b7ad5eae028..08602989fe8 100755
--- a/dist/s_docs
+++ b/dist/s_docs
@@ -1,8 +1,7 @@
 #! /bin/sh
 
 t=__wt.$$
-b=__wtdoxy.$$
-trap 'rm -f $b $t; exit 0' 0 1 2 3 13 15
+trap 'rm -f $t /tmp/__doxy; exit 0' 0 1 2 3 13 15
 
 # Skip this when building release packages: docs are built separately
 test -n "$WT_RELEASE_BUILD" && exit 0
@@ -31,20 +30,18 @@ wtperf_config()
 {
 	# The Linux ed command writes line numbers to stderr, redirect both
 	# stdout and stderr to keep things quiet.
-	cc -o $b -I../src/include ../bench/wtperf/doxy.c || {
-		echo "$0: unable to compile doxy.c"
-		exit 1
-	}
+	cc -o /tmp/__doxy ../bench/wtperf/doxy.c &&
 	(echo '/START_AUTO_GENERATED_WTPERF_CONFIGURATION/+3,/STOP_AUTO_GENERATED_WTPERF_CONFIGURATION/-1d'
 	 echo 'i'
 	 echo ''
 	 echo '.'
-	 echo ".r !./$b"
+	 echo ".r !/tmp/__doxy"
 	 echo 'a'
 	 echo ''
 	 echo '.'
 	 echo 'w'
-	 echo 'q') | ed ../src/docs/wtperf.dox 1>/dev/null 2>/dev/null
+	 echo 'q') | ed ../src/docs/wtperf.dox 1>/dev/null 2>/dev/null &&
+	 rm -f /tmp/__doxy
 }
 
 structurechk()