File tree 1 file changed +6
-11
lines changed
1 file changed +6
-11
lines changed Original file line number Diff line number Diff line change @@ -774,9 +774,8 @@ python_newexe() {
774
774
local f=${1}
775
775
local newfn=${2}
776
776
777
- local PYTHON_SCRIPTDIR d
778
- python_export PYTHON_SCRIPTDIR
779
- d=${PYTHON_SCRIPTDIR# ${EPREFIX} }
777
+ local scriptdir=$( python_get_scriptdir)
778
+ local d=${scriptdir# ${EPREFIX} }
780
779
781
780
(
782
781
dodir " ${wrapd} "
@@ -902,10 +901,8 @@ python_domodule() {
902
901
d=${python_moduleroot}
903
902
else
904
903
# relative to site-packages
905
- local PYTHON_SITEDIR=${PYTHON_SITEDIR}
906
- [[ ${PYTHON_SITEDIR} ]] || python_export PYTHON_SITEDIR
907
-
908
- d=${PYTHON_SITEDIR# ${EPREFIX} } /${python_moduleroot// .// }
904
+ local sitedir=$( python_get_sitedir)
905
+ d=${sitedir# ${EPREFIX} } /${python_moduleroot// .// }
909
906
fi
910
907
911
908
(
@@ -935,10 +932,8 @@ python_doheader() {
935
932
936
933
[[ ${EPYTHON} ]] || die ' No Python implementation set (EPYTHON is null).'
937
934
938
- local d PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR}
939
- [[ ${PYTHON_INCLUDEDIR} ]] || python_export PYTHON_INCLUDEDIR
940
-
941
- d=${PYTHON_INCLUDEDIR# ${EPREFIX} }
935
+ local includedir=$( python_get_includedir)
936
+ local d=${includedir# ${EPREFIX} }
942
937
943
938
(
944
939
insopts -m 0644
You can’t perform that action at this time.
0 commit comments