diff options
| author | Craig Silverstein <csilvers@khanacademy.org> | 2008-05-14 19:48:54 +0000 |
|---|---|---|
| committer | Craig Silverstein <csilvers@khanacademy.org> | 2008-05-14 19:48:54 +0000 |
| commit | 9297c6aa8c761a820bba2239e8885f63c67dcf87 (patch) | |
| tree | 4bf2235787e5687044077aa93a36f2fc5b3cb68d /Makefile.in | |
| parent | e9c02f462a54564b5b50f831dc6d75e6d3f96991 (diff) | |
| download | distcc-git-9297c6aa8c761a820bba2239e8885f63c67dcf87.tar.gz | |
1) Fix up a PATH= assignment that would fail if builddir had spaces in
it (because the output of `cd "$builddir" && pwd` was not being
quoted). As a bonus, make the PATH= fit on one line, which makes some
shells happier.
2) Fixed up some install targets. On some systems, tar without -f
reads from stdin, but that's non-standard (it should read from some
tape-drive device in /dev in that case). Add -f- to $(TAR) in that
case, which should work everywhere.
3) cp -a isn't supported on all systems. I checked what automake
does, and it emits cp -pR, so that's what I do too. We don't have any
internal symlinks that I need to worry about -P or anything like
that.
Tested by running 'make installcheck' on a freebsd 6.0 system.
Reviewed by fergus@google.com
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index f99eaba..559dc11 100644 --- a/Makefile.in +++ b/Makefile.in @@ -595,7 +595,7 @@ distcheck: dist [ ! -d +distcheck ] || chmod -R u+w +distcheck rm -rf '+distcheck' mkdir '+distcheck' - cd '+distcheck' && $(GZIP_BIN) -d < "../$(tarball_gz)" | $(TAR) xv + cd '+distcheck' && $(GZIP_BIN) -d < "../$(tarball_gz)" | $(TAR) xvf - mkdir "+distcheck/$(distdir)/_build" mkdir "+distcheck/$(distdir)/_inst" chmod -R a-w +distcheck @@ -624,8 +624,8 @@ dist-sign: dist-files: $(dist_files) for f in $(dist_files) $(dist_dirs); do \ mkdir -p "$(distdir)"/`dirname "$$f"` || exit 1; \ - cp -a "$(srcdir)/$$f" "$(distdir)/$$f" 2>/dev/null || \ - cp -a "$$f" "$(distdir)/$$f" || exit 1; \ + cp -pR "$(srcdir)/$$f" "$(distdir)/$$f" 2>/dev/null || \ + cp -pR "$$f" "$(distdir)/$$f" || exit 1; \ done for f in $(dist_dirs); do \ find "$(distdir)/$$f" -name '.[^.]*' -exec rm -rf \{\} \; -prune ; \ @@ -786,8 +786,8 @@ verify-binaries-installcheck: # Lookup distcc programs to be checked in $(DISTCC_INSTALLATION). The # check_PROGRAMS binaries, however, are to be found in $(builddir). distcc-installcheck: $(check_PROGRAMS) - PATH="$(DISTCC_INSTALLATION)":\ -`cd "$(builddir)" && pwd`:"$(RESTRICTED_PATH)" \ + BUILDDIR=`cd "$(builddir)" && pwd`; \ + PATH="$(DISTCC_INSTALLATION):$$BUILDDIR:$(RESTRICTED_PATH)" \ TESTDISTCC_OPTS="$(TESTDISTCC_OPTS)" \ $(MAKE) maintainer-check-no-set-path |