------------------------------------------------------------ revno: 256 [merge] committer: Brian Gough <[email protected]> branch nick: trunk timestamp: Fri 2010-07-30 11:56:39 +0100 message: merged changed from fencepost modified: deps/mpc/Makefile gar.mk
=== modified file 'deps/mpc/Makefile' --- a/deps/mpc/Makefile 2010-06-22 09:04:59 +0000 +++ b/deps/mpc/Makefile 2010-07-30 10:16:33 +0000 @@ -8,7 +8,9 @@ SIGFILES = $(DISTNAME).tar.gz.asc # BUILDDEPS = -# LIBDEPS = +LIBDEPS = gnu/mpfr gnu/gmp + +CONFIGURE_OPTS = --with-mpfr=$(prefix) --with-gmp=$(prefix) HOME_URL = http://www.multiprecision.org/ DESCRIPTION = multi-precision C library for complex numbers with correct rounding.
=== modified file 'gar.mk' --- a/gar.mk 2010-07-27 20:05:36 +0000 +++ b/gar.mk 2010-07-30 10:56:39 +0000 @@ -67,10 +67,16 @@ #################### DIRECTORY MAKERS #################### # This is to make dirs as needed by the base rules -$(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR)) $(COOKIEDIR)/%: - @if test -d $@; then : ; else \ - mkdir -p $@; \ - fi +$(sort $(DOWNLOADDIR) $(COOKIEDIR) $(LOGDIR) $(WORKSRC) $(WORKDIR) $(EXTRACTDIR) $(FILEDIR) $(SCRATCHDIR)): + @if test -d $@; then : ; else \ + mkdir -p $@; \ + fi + +$(COOKIEDIR)/%: + @if test -d $@; then : ; else \ + mkdir -p $@; \ + fi + # include the configuration file to override any of these variables include $(GARDIR)/gar.conf.mk @@ -292,7 +298,7 @@ # A logging version of the rules, e.g. make build-log, respawns and sends output to $(LOGDIR) %-log: $(LOGDIR) - $(MAKE) $*-p || ($(MAKE) $* 2>&1 | tee $(LOGDIR)/$*.log) + $(MAKE) $*-p || $(MAKE) $* >$(LOGDIR)/$*.log 2>&1 .PHONY: $(addsuffix fetch checksum extract patch configure build test install,-log)
