diff options
author | klarlund <klarlund@01de4be4-8c4a-0410-9132-4925637da917> | 2008-05-09 18:00:11 +0000 |
---|---|---|
committer | klarlund <klarlund@01de4be4-8c4a-0410-9132-4925637da917> | 2008-05-09 18:00:11 +0000 |
commit | 8acf0c1215996e2d5ece310080a2d23a007c6f61 (patch) | |
tree | 6eef6e7f8fbee9c0e5b5f67f4ca8c248e2957bef /pump.in | |
parent | 4d27f478a080e66df808590839c6beee6e1ab30a (diff) | |
download | distcc-8acf0c1215996e2d5ece310080a2d23a007c6f61.tar.gz |
Rewrite setup.py and associated logic to fix multiple build problems.
The recent distcheck revealed that paths were set incorrectly for the setup.py
script. Also, as I dug deeper, it turned out that built files were placed in
the src directory (thanks to os.path.join I found in the distutil's source code,
that trips up the location if relative paths contains too many '..'s.). [The
distccheck revealed this!] I didn't like either that setup was run in the
source directory and not from the build directory (that's asking for trouble).
I did't like either that the search path, the list of includes, in setup.py was
handcoded and not simply that of CPPFLAGS. Finally, I was confused by _builddir
being another build directory under $(buildir). I renamed the former
_include_server to better explain its role.
So, I rewrote most of setup.py (correcting some of the documentation strings
along the way). Also, I partly removed the 'jumping through the hoops'
gymnastics from the Makefile.
TESTING: 'make distcheck'
REVIEWERS: csilvers, fergus
git-svn-id: http://distcc.googlecode.com/svn/trunk@147 01de4be4-8c4a-0410-9132-4925637da917
Diffstat (limited to 'pump.in')
-rwxr-xr-x | pump.in | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -127,7 +127,7 @@ Initialize() { # set when the 'pump' script is made from 'pump.in'. Use this value in the # formation of the relative path that takes us from the 'bin' directory of an # installation to the 'include_server' directory. - include_server_relative="../lib/$PYTHON/site-packages/include_server" + include_server_relative="../lib/$(basename $PYTHON)/site-packages/include_server" # We use a little heuristic to determine whether this pump script is part of # an installation. Specifically, we check whether we're a bin directory, and |