Index: Mk/Uses/python.mk =================================================================== --- Mk/Uses/python.mk +++ Mk/Uses/python.mk @@ -192,6 +192,7 @@ # PYTHON_PLATFORM=${PYTHON_PLATFORM} # PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} # PYTHON_VERSION=${PYTHON_VERSION} +# PYTHON_VER=${PYTHON_VER} # # # Deprecated variables, which exist for compatibility and will be removed @@ -578,9 +579,12 @@ @${SED} -e 's|^${STAGEDIR}${PREFIX}/||' \ -e 's|^${PREFIX}/||' \ -e 's|^\(man/.*man[0-9]\)/\(.*\.[0-9]\)$$|\1/\2.gz|' \ + -e 's|[[:alnum:]|[:space:]]*/\.\./*||g; s|/\./|/|g' \ ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST} @${SED} -e 's|^${STAGEDIR}${PREFIX}/\(.*\)/\(.*\)|\1|' \ - -e 's|^${PREFIX}/\(.*\)/\(.*\)|\1|' ${_PYTHONPKGLIST} | \ + -e 's|^${PREFIX}/\(.*\)/\(.*\)|\1|' \ + -e 's|[[:alnum:]|[:space:]]*/\.\./*||g; s|/\./|/|g' \ + ${_PYTHONPKGLIST} | \ ${AWK} '{ num = split($$0, a, "/"); res=""; \ for(i = 1; i <= num; ++i) { \ if (i == 1) res = a[i]; \ @@ -654,7 +658,8 @@ PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \ PYTHON_PLATFORM=${PYTHON_PLATFORM} \ PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \ - PYTHON_VERSION=${PYTHON_VERSION} + PYTHON_VERSION=${PYTHON_VERSION} \ + PYTHON_VER=${PYTHON_VER} _USES_POST+= python .endif # _INCLUDE_USES_PYTHON_MK