Merge branch 'develop' of git://github.com/sagemath/sage into develop

sagemath · Apr 26, 2016 · f077211 · f077211
2 parents 08494a2 + 950f0f5
commit f077211
Show file tree

Hide file tree

Showing 1,855 changed files with 109,405 additions and 51,952 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,6 @@
 /local
 /logs
 /upstream
-/src/mac-app/build
 
 #############################
 # Autotools generated files #

diff --git a/COPYING.txt b/COPYING.txt
@@ -89,6 +89,7 @@ mpmath                      Modified BSD
 networkx                    Modified BSD
 ntl                         GPLv2+
 numpy                       Modified BSD
+openblas                    Modified BSD
 palp                        GPLv3
 pari                        GPLv2+
 patch                       GPLv2+

diff --git a/Makefile b/Makefile
@@ -13,13 +13,14 @@ build: all-build
 
 # Defer unknown targets to build/make/Makefile
 %::
+	@if [ -x relocate-once.py ]; then ./relocate-once.py; fi
 	$(MAKE) build/make/Makefile
 	+build/bin/sage-logger \
 		"cd build/make && ./install '$@'" logs/install.log
 
 # If configure was run before, rerun it with the old arguments.
 # Otherwise, run configure with argument $PREREQ_OPTIONS.
-build/make/Makefile: configure build/pkgs/*/*
+build/make/Makefile: configure build/make/deps build/pkgs/*/*
 	rm -f config.log
 	mkdir -p logs/pkgs
 	ln -s logs/pkgs/config.log config.log