Refactor sdistcheck targets and fix dependencies

sagemath · May 17, 2020 · 4d8b72c · 4d8b72c
1 parent 9c7ecbe
commit 4d8b72c
Showing 1 changed file with 15 additions and 16 deletions.
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -30,6 +30,15 @@ all: sage
 ## TODO: Currently providing --install-base=$(SAGE_LOCAL) leads to this error:
 ## [sagelib-7.4.beta4] running install
 ## [sagelib-7.4.beta4] error: install-base or install-platbase supplied, but installation scheme is incomplete
+
+POISON_ENV =					\
+	SAGE_ROOT=/doesnotexist			\
+	SAGE_SRC=/doesnotexist			\
+	SAGE_SRC_ROOT=/doesnotexist		\
+	SAGE_DOC_SRC=/doesnotexist		\
+	SAGE_SCRIPTS_DIR=/doesnotexist		\
+	SAGE_BUILD_DIR=/doesnotexist
+
 sage:
 	cd $(srcdir) && export                                    \
 	    SAGE_ROOT=/doesnotexist                               \
@@ -53,29 +62,19 @@ clean:
 .PHONY: sdist sdistcheck
 sdist:
 	cd $(srcdir)							\
-	&& export SAGE_ROOT=/doesnotexist				\
-		  SAGE_SRC=/doesnotexist				\
-		  SAGE_SRC_ROOT=/doesnotexist				\
-		  SAGE_DOC_SRC=/doesnotexist				\
-		  SAGE_SCRIPTS_DIR=/doesnotexist			\
-		  SAGE_BUILD_DIR=/doesnotexist				\
+	&& export $(POISON_ENV)						\
 		  SAGE_PKGS=$(abs_top_srcdir)/build/pkgs		\
 		  SAGE_CYTHONIZED=$(abs_builddir)/build/cythonized	\
 	&& python -u setup.py sdist --formats=bztar
 
-sdistcheck-unpack:
+sdistcheck-unpack: sdist
 	rm -rf sage-$(PACKAGE_VERSION)					\
 	&& tar xf dist/sage-$(PACKAGE_VERSION).tar.bz2
 
-sdistcheck-build:
-	cd sage-$(PACKAGE_VERSION)					\
-	&& export SAGE_ROOT=/doesnotexist				\
-		   SAGE_SRC=/doesnotexist				\
-		   SAGE_SRC_ROOT=/doesnotexist				\
-		   SAGE_DOC_SRC=/doesnotexist				\
-		   SAGE_SCRIPTS_DIR=/doesnotexist			\
-		   SAGE_BUILD_DIR=/doesnotexist				\
-		   SAGE_PKGS=$(abs_top_srcdir)/build/pkgs		\
+sdistcheck-build: sdistcheck-unpack
+	cd sage-$(PACKAGE_VERSION)				\
+	&& export $(POISON_ENV)					\
+		   SAGE_PKGS=$(abs_top_srcdir)/build/pkgs	\
 		   SAGE_CYTHONIZED=`pwd`/build/cythonized	\
 	&& python -u setup.py install