diff options
| author | fergus.henderson <fergus.henderson@01de4be4-8c4a-0410-9132-4925637da917> | 2008-07-02 00:34:01 +0000 |
|---|---|---|
| committer | fergus.henderson <fergus.henderson@01de4be4-8c4a-0410-9132-4925637da917> | 2008-07-02 00:34:01 +0000 |
| commit | 054bb885e830ac9a5d680e15bf0ef5af1e4174ec (patch) | |
| tree | 323494bea27b78b7c9d0bb53e43b6b52bc58008d | |
| parent | 4a5ed9d72d3eecc60de9431d2c825aecda45ec7a (diff) | |
| download | distcc-054bb885e830ac9a5d680e15bf0ef5af1e4174ec.tar.gz | |
Fix a bug reported by Aaron P. Perez <Aaron.Perez@hospira.com>
where "make install" was failing on Cygwin.
The problem was due to the install.log file generated by Python's
distutils being generated in DOS text mode format rather than
Unix text mode format. The fix is to use 'sed' to convert
DOS text format to Unix text format when generating install.log.
Note: this fix is slightly different than the original patch
that I posted to the distcc mailing list. This patch is better
because it fixes the install.log file, rather than just the
grep command; this is important because the install.log file
is also used for "make uninstall".
Reviewers: Craig Silverstein
git-svn-id: http://distcc.googlecode.com/svn/trunk@549 01de4be4-8c4a-0410-9132-4925637da917
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 11d5f8e..d18bba5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1018,7 +1018,10 @@ install-programs: $(bin_PROGRAMS) # --record output and modify the installed pump to have that location. # Note: --record output is inconsistent (buggy?) and sometimes leaves out # the leading slash in $prefix, even though we require prefix start with -# a slash. We add it back in at cp time. +# a slash. We use sed to add it back in at cp time. +# Also, on Cygwin the --record output is in DOS text file format (CR LF +# line endings), so we need to convert it from DOS text file format to +# Unix text file format (LF line endings); we use sed for that too. install-include-server: include-server pump if test -z "$(INCLUDESERVER_PYTHON)"; then \ echo "Not building $@: No suitable python found"; \ @@ -1037,7 +1040,10 @@ install-include-server: include-server pump --record="$(include_server_builddir)/install.log.pre" \ --root="$$DESTDIR" \ || exit 1; \ - sed '/^[^\/]/ s,^,/,' "$(include_server_builddir)/install.log.pre" > "$(include_server_builddir)/install.log"; \ + sed -e '/^[^\/]/ s,^,/,' \ + -e 's/\r$$//' \ + "$(include_server_builddir)/install.log.pre" \ + > "$(include_server_builddir)/install.log"; \ if test -n "$(PYTHON_INSTALL_RECORD)"; then \ cp -f "$(include_server_builddir)/install.log" "$(PYTHON_INSTALL_RECORD)"; \ fi; \ |