The second part of my change to hoist everything in the distcc/

directory up to the top level: delete the distcc directory (I already
copied it all to the top level in my last commit).

This requires changing all files that refer to distcc/FOO to refer
directly to FOO instead.  Mostly this is Makefile.in and setup.py, but
there are a few other changes in scripts that have to hard-code paths,
like configure.ac and pump.in.  Also, several files changed their
comments to refer to the new location, which isn't strictly necessary
but I did anyway.

The only other change I made was to get rid of the hack I had put in
before, which renamed distcc to distcc-bin.  I had needed to do that
before, temporarily, because "distcc" was already the name of a
directory, and couldn't also be the name of a binary.  Now that the
distcc directory is going away, I can rename the target back to
distcc.

Tested by running './autogen; ./configure; make maintainer-check'.
I also ran 'make pump-check' and 'make distcheck'.

To be reviewed (post-facto) by klarlund@google.com and fergus@google.com

2 files changed, 27 insertions, 27 deletions

diff --git a/include_server/basics.py b/include_server/basics.py
index 597313d..a6aa5bf 100755
--- a/include_server/basics.py
+++ b/include_server/basics.py
@@ -89,7 +89,7 @@ def InitializeClientRoot(generation):
                (client_root, why))
       
 
-# For automated emails, see also distcc/src/emaillog.h.
+# For automated emails, see also src/emaillog.h.
 DCC_EMAILLOG_WHOM_TO_BLAME = os.getenv("DISTCC_EMAILLOG_WHOM_TO_BLAME",
                                        "distcc-pump-errors") 
 EMAIL_SUBJECT = "distcc-pump include server email"
@@ -171,7 +171,7 @@ BAD_REALPATH_WARNING_MSG = (
 # out how to install GNU Objective C++.  We need to test it before
 # enabling it.)
 # To enable, uncomment the code below and the test case
-# ObjectiveC(PlusPlus)_Case in ../distcc/test/testdistcc.py.)
+# ObjectiveC(PlusPlus)_Case in ../test/testdistcc.py.)
 
 LANGUAGES = set(["c", "c++"])
 #LANGUAGES = set(["c", "c++", "objective-c", "objective-c++"])
diff --git a/include_server/setup.py b/include_server/setup.py
index fbef492..8b62ea1 100755
--- a/include_server/setup.py
+++ b/include_server/setup.py
@@ -28,35 +28,35 @@ from distutils.extension import Extension
 ext = Extension(
     name="include_server.distcc_pump_c_extensions",
     sources=[
-             '../distcc/src/clirpc.c',
-             '../distcc/src/clinet.c',
-             '../distcc/src/state.c',
-             '../distcc/src/srvrpc.c',
-             '../distcc/src/pump.c',
-             '../distcc/src/rpc.c',
-             '../distcc/src/io.c',
-             '../distcc/src/include_server_if.c',
-             '../distcc/src/trace.c',
-             '../distcc/src/util.c',
-             '../distcc/src/tempfile.c',
-             '../distcc/src/filename.c',
-             '../distcc/src/bulk.c',
-             '../distcc/src/sendfile.c',
-             '../distcc/src/compress.c',
-             '../distcc/src/argutil.c',
-             '../distcc/src/cleanup.c',
-             '../distcc/src/emaillog.c',
-             '../distcc/src/timeval.c',
-             '../distcc/src/netutil.c',
-             '../distcc/lzo/minilzo.c',
+             '../src/clirpc.c',
+             '../src/clinet.c',
+             '../src/state.c',
+             '../src/srvrpc.c',
+             '../src/pump.c',
+             '../src/rpc.c',
+             '../src/io.c',
+             '../src/include_server_if.c',
+             '../src/trace.c',
+             '../src/util.c',
+             '../src/tempfile.c',
+             '../src/filename.c',
+             '../src/bulk.c',
+             '../src/sendfile.c',
+             '../src/compress.c',
+             '../src/argutil.c',
+             '../src/cleanup.c',
+             '../src/emaillog.c',
+             '../src/timeval.c',
+             '../src/netutil.c',
+             '../lzo/minilzo.c',
              'c_extensions/distcc_pump_c_extensions_module.c',
              ],
-    include_dirs = ["../distcc/src", 
-                    "../distcc/lzo",
+    include_dirs = ["../src", 
+                    "../lzo",
                     os.path.join(os.getenv("BUILDDIR") or "", 
-                                 "../distcc/src"),
+                                 "../src"),
                     os.path.join(os.getenv("BUILDDIR") or "", 
-                                 "../../distcc/src"),
+                                 "../../src"),
                    ],
     define_macros = [('_GNU_SOURCE', 1)],
     library_dirs = [],