Move and rename "callprocs" utility to tools/callprocs.sh.

* callprocs: Move/rename to tools/callprocs.sh.
* Makefile.am (dist_noinst_SCRIPTS): Remove.
* Makefile.am (EXTRA_DIST): Add tools/callprocs.sh (move from
dist_noinst_SCRIPTS).
* Makefile.direct (OTHER_FILES): Rename callprocs to
tools/callprocs.sh.
* Makefile.dj (OTHER_FILES): Likewise.
* README: Likewise.
* doc/leak.html: Likewise.
* README: Fix a typo.

6 files changed, 62 insertions, 65 deletions

diff --git a/Makefile.am b/Makefile.am
index 2e43971e..dce0941c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,9 +146,6 @@ endif
 
 CCASFLAGS += $(DEFS)
 
-dist_noinst_SCRIPTS = callprocs
-    ## callprocs --- used by Makefile.direct
-
 # headers which are not installed
 # (see include/include.am for more)
 #
@@ -173,7 +170,7 @@ EXTRA_DIST += tools/add_gc_prefix.c tools/gcname.c tools/if_mach.c \
     gc.mak extra/gc.c extra/MacOS.c mach_dep.c extra/AmigaOS.c \
     Mac_files/datastart.c Mac_files/dataend.c \
     Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-    include/private/msvc_dbg.h extra/msvc_dbg.c
+    include/private/msvc_dbg.h extra/msvc_dbg.c tools/callprocs.sh
 
 #
 # :GOTCHA: GNU make rule for making .s out of .S is flawed,
diff --git a/Makefile.direct b/Makefile.direct
index 2be43311..4bceb156 100644
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -83,69 +83,69 @@ CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c \
   backgraph.c win32_threads.c pthread_start.c thread_local_alloc.c
 
 CORD_SRCS= cord/cordbscs.c cord/cordxtra.c cord/cordprnt.c cord/de.c \
-    cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h \
-    cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.RC
+  cord/cordtest.c include/cord.h include/ec.h include/private/cord_pos.h \
+  cord/de_win.c cord/de_win.h cord/de_cmds.h cord/de_win.RC
 
 CORD_OBJS= cord/cordbscs.o cord/cordxtra.o cord/cordprnt.o
 
 SRCS= $(CSRCS) \
-    include/gc.h include/gc_typed.h include/gc_tiny_fl.h \
-    include/gc_version.h include/private/gc_hdrs.h include/private/gc_priv.h \
-    include/private/gcconfig.h include/private/gc_pmark.h \
-    include/gc_inline.h include/gc_mark.h tools/threadlibs.c \
-    tools/if_mach.c tools/if_not_there.c gc_cpp.cc include/gc_cpp.h \
-    tools/gcname.c include/weakpointer.h include/private/gc_locks.h \
-    include/new_gc_alloc.h include/gc_allocator.h \
-    include/javaxfc.h \
-    include/gc_backptr.h include/gc_gcj.h include/private/dbg_mlc.h \
-    include/private/specific.h include/leak_detector.h \
-    include/gc_pthread_redirects.h \
-    include/gc_config_macros.h include/private/pthread_support.h \
-    include/private/pthread_stop_world.h include/private/darwin_semaphore.h \
-    include/private/darwin_stop_world.h include/private/thread_local_alloc.h \
-    src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
-    src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s $(CORD_SRCS)
+  include/gc.h include/gc_typed.h include/gc_tiny_fl.h \
+  include/gc_version.h include/private/gc_hdrs.h include/private/gc_priv.h \
+  include/private/gcconfig.h include/private/gc_pmark.h \
+  include/gc_inline.h include/gc_mark.h tools/threadlibs.c \
+  tools/if_mach.c tools/if_not_there.c gc_cpp.cc include/gc_cpp.h \
+  tools/gcname.c include/weakpointer.h include/private/gc_locks.h \
+  include/new_gc_alloc.h include/gc_allocator.h \
+  include/javaxfc.h \
+  include/gc_backptr.h include/gc_gcj.h include/private/dbg_mlc.h \
+  include/private/specific.h include/leak_detector.h \
+  include/gc_pthread_redirects.h \
+  include/gc_config_macros.h include/private/pthread_support.h \
+  include/private/pthread_stop_world.h include/private/darwin_semaphore.h \
+  include/private/darwin_stop_world.h include/private/thread_local_alloc.h \
+  src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \
+  src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s $(CORD_SRCS)
 
 DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.MacOSX doc/README.OS2 \
-	doc/README.amiga doc/README.cords doc/debugging.html \
-	doc/porting.html doc/overview.html \
-	doc/README.dj doc/README.hp doc/README.linux doc/README.rs6000 \
-	doc/README.sgi doc/README.solaris2 doc/README.uts \
-	doc/README.win32 doc/barrett_diagram \
-        README AUTHORS doc/gc.man \
-	doc/README.environment doc/tree.html doc/gcdescr.html \
-	doc/README.autoconf doc/README.macros doc/README.ews4800 \
-	doc/README.DGUX386 doc/README.arm.cross doc/leak.html \
-	doc/scale.html doc/gcinterface.html doc/README.darwin \
-	doc/simple_example.html doc/README.win64
+  doc/README.amiga doc/README.cords doc/debugging.html \
+  doc/porting.html doc/overview.html \
+  doc/README.dj doc/README.hp doc/README.linux doc/README.rs6000 \
+  doc/README.sgi doc/README.solaris2 doc/README.uts \
+  doc/README.win32 doc/barrett_diagram \
+  README AUTHORS doc/gc.man \
+  doc/README.environment doc/tree.html doc/gcdescr.html \
+  doc/README.autoconf doc/README.macros doc/README.ews4800 \
+  doc/README.DGUX386 doc/README.arm.cross doc/leak.html \
+  doc/scale.html doc/gcinterface.html doc/README.darwin \
+  doc/simple_example.html doc/README.win64
 
 TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
-	tests/leak_test.c tests/thread_leak_test.c tests/middle.c \
-	tests/smash_test.c tests/huge_test.c
+  tests/leak_test.c tests/thread_leak_test.c tests/middle.c \
+  tests/smash_test.c tests/huge_test.c
 
 GNU_BUILD_FILES= configure.ac Makefile.am configure install-sh Makefile.in \
-		 aclocal.m4 config.sub config.guess \
-		 include/include.am doc/doc.am \
-		 ltmain.sh mkinstalldirs depcomp missing \
-		 cord/cord.am tests/tests.am autogen.sh \
-		 bdw-gc.pc.in compile
+  aclocal.m4 config.sub config.guess \
+  include/include.am doc/doc.am \
+  ltmain.sh mkinstalldirs depcomp missing \
+  cord/cord.am tests/tests.am autogen.sh \
+  bdw-gc.pc.in compile
 
 OTHER_MAKEFILES= OS2_MAKEFILE NT_MAKEFILE gc.mak \
-		 BCC_MAKEFILE EMX_MAKEFILE WCC_MAKEFILE Makefile.dj \
-		 PCR-Makefile SMakefile.amiga Makefile.DLLs \
-		 digimars.mak Makefile.direct NT_STATIC_THREADS_MAKEFILE \
-		 NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \
-		 build_atomic_ops.sh build_atomic_ops.sh.cygwin
-
-OTHER_FILES= Makefile tools/setjmp_t.c callprocs extra/MacOS.c \
-           Mac_files/datastart.c Mac_files/dataend.c \
-           Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           tools/add_gc_prefix.c gc_cpp.cpp \
-           extra/AmigaOS.c extra/msvc_dbg.c include/private/msvc_dbg.h \
-	   $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
+  BCC_MAKEFILE EMX_MAKEFILE WCC_MAKEFILE Makefile.dj \
+  PCR-Makefile SMakefile.amiga Makefile.DLLs \
+  digimars.mak Makefile.direct NT_STATIC_THREADS_MAKEFILE \
+  NT_X64_STATIC_THREADS_MAKEFILE NT_X64_THREADS_MAKEFILE \
+  build_atomic_ops.sh build_atomic_ops.sh.cygwin
+
+OTHER_FILES= Makefile tools/setjmp_t.c tools/callprocs.sh extra/MacOS.c \
+  Mac_files/datastart.c Mac_files/dataend.c \
+  Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
+  tools/add_gc_prefix.c gc_cpp.cpp \
+  extra/AmigaOS.c extra/msvc_dbg.c include/private/msvc_dbg.h \
+  $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
-	$(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
+  $(srcdir)/include/ec.h $(srcdir)/include/private/cord_pos.h
 
 UTILS= if_mach if_not_there threadlibs
 
diff --git a/Makefile.dj b/Makefile.dj
index 16af4691..eb793434 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -62,8 +62,8 @@ SRCS= $(CSRCS) \
 
 OTHER_FILES= Makefile PCR-Makefile OS2_MAKEFILE NT_MAKEFILE BCC_MAKEFILE \
            README tests/test.c test_cpp.cc tools/setjmp_t.c SMakefile.amiga \
-           doc/README.amiga doc/README.win32 \
-	   doc/README.cords doc/README.rs6000 README.QUICK TODO callprocs \
+           doc/README.amiga doc/README.win32 doc/README.cords \
+           doc/README.rs6000 README.QUICK TODO tools/callprocs.sh \
            pc_excludes barrett_diagram doc/README.OS2 doc/README.Mac \
            extra/MacOS.c EMX_MAKEFILE \
            doc/README.debugging Mac_files/datastart.c Mac_files/dataend.c \
diff --git a/README b/README
index 403769c8..a5b39328 100644
--- a/README
+++ b/README
@@ -414,8 +414,8 @@ also be automatically reclaimed.
 the default version of report_leak will report at least the source file and
 line number at which the leaked object was allocated.  This may sometimes be
 sufficient.  (On a few machines, it will also report a cryptic stack trace.
-If this is not symbolic, it can somethimes be called into a sympolic stack
-trace by invoking program "foo" with "callprocs foo".  Callprocs is a short
+If this is not symbolic, it can somethimes be called into a symbolic stack
+trace by invoking program "foo" with "tools/callprocs.sh foo".  It is a short
 shell script that invokes adb to expand program counter values to symbolic
 addresses.  It was largely supplied by Scott Schwartz.)
   Note that the debugging facilities described in the next section can
diff --git a/doc/leak.html b/doc/leak.html
index b3c21a09..7751a131 100644
--- a/doc/leak.html
+++ b/doc/leak.html
@@ -106,19 +106,19 @@ The program to be tested for leaks can then look like:
 main() {
     int *p[10];
     int i;
-    /* GC_find_leak = 1; for new collector versions not 	*/
-    /* compiled with -DFIND_LEAK.				*/
+    /* GC_find_leak = 1; for new collector versions not         */
+    /* compiled with -DFIND_LEAK.                               */
     for (i = 0; i < 10; ++i) {
-	p[i] = malloc(sizeof(int)+i);
+        p[i] = malloc(sizeof(int)+i);
     }
     for (i = 1; i < 10; ++i) {
-	free(p[i]);
+        free(p[i]);
     }
     for (i = 0; i < 9; ++i) {
-	p[i] = malloc(sizeof(int)+i);
+        p[i] = malloc(sizeof(int)+i);
     }
     CHECK_LEAKS();
-}	
+}
 </pre>
 <P>
 On an Intel X86 Linux system this produces on the stderr stream:
@@ -155,8 +155,8 @@ counter inside the caller to main (i.e. in the C startup code).
 In the Irix case, only the address inside the caller to main is given.
 <P>
 In many cases, a debugger is needed to interpret the additional information.
-On systems supporting the "adb" debugger, the <TT>callprocs</tt> script
-can be used to replace program counter values with symbolic names.
+On systems supporting the "adb" debugger, the <TT>tools/callprocs.sh</tt>
+script can be used to replace program counter values with symbolic names.
 As of version 6.1, the collector tries to generate symbolic names for
 call stacks if it knows how to do so on the platform.  This is true on
 Linux/X86, but not on most other platforms.
diff --git a/callprocs b/tools/callprocs.sh
index a8793f0b..a8793f0b 100755
--- a/callprocs
+++ b/tools/callprocs.sh