build/make/Makefile.in [SCRIPT_PACKAGE_templ]: cd into the SPKG direc…

…tory; adjust spkg-install scripts
sagemath · Jun 4, 2020 · df3f05e · df3f05e
1 parent 0e66a0a
commit df3f05e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -574,15 +574,15 @@ endif
 #     $(3): package dependencies
 define SCRIPT_PACKAGE_templ
 $$(INST)/$(1)-$(2): $(3)
-	$(AM_V_at)cd '$$(SAGE_ROOT)' && \
+	$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env' && . '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
 		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1).log'
 	touch "$$@"
 
 $(1): $$(INST)/$(1)-$(2)
 
 $(1)-clean:
-	-$(AM_V_at)cd '$$(SAGE_ROOT)' && \
+	-$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env' && . '$$(SAGE_ROOT)/build/bin/sage-build-env-config' && \
 		'$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-uninstall'
 	-rm -f "$$(INST)/$(1)-$(2)"

diff --git a/build/pkgs/sage_conf/spkg-install b/build/pkgs/sage_conf/spkg-install
@@ -9,4 +9,4 @@ if [ $? -ne 0 ]; then
     echo >&2 "Is $SAGE_ROOT the correct SAGE_ROOT?"
     exit 1
 fi
-cd $SAGE_ROOT/build/pkgs/sage_conf/src && sdh_pip_install .
+cd src && sdh_pip_install .
diff --git a/build/pkgs/texlive/spkg-install b/build/pkgs/texlive/spkg-install
@@ -1 +1 @@
-exec sage-python23 build/pkgs/texlive/spkg-install.py
+exec sage-python23 spkg-install.py
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		exec sage-python23 build/pkgs/texlive/spkg-install.py
		exec sage-python23 spkg-install.py