diff options
-rw-r--r-- | osx/Makefile | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/osx/Makefile b/osx/Makefile index 698d060ab..c0211bb1e 100644 --- a/osx/Makefile +++ b/osx/Makefile @@ -1,4 +1,6 @@ PYVERSION := $(shell /usr/bin/python -c "import sys; print sys.version[0:3]") +PYMAJORVERSION := $(shell /usr/bin/python -c "import sys; print sys.version[0:1]") +PYMINORVERSION := $(shell /usr/bin/python -c "import sys; print sys.version[2:3]") PREFLIGHT = preflight POSTFLIGHT = postflight PKGROOT = bcfg2pkg @@ -74,11 +76,8 @@ prepare: install chmod 0770 "${PKGTMP}/scripts/${PREFLIGHT}" chmod 0770 "${PKGTMP}/scripts/${POSTFLIGHT}" - # add in M2Crypto - /bin/expr ${PYVERSION} \< 2.6 && \ - cp "M2Crypto-0.20.2-py2.5-macosx-10.5-ppc.egg" "${PKGROOT}/${SITELIBDIR}" && \ - cp "easy-install.pth" "${PKGROOT}/${SITELIBDIR}" - + # add in M2Crypto if python version is less than 2.6 + if [[ ${PYMAJORVERSION} == 2 ]]; then if [[ ${PYMINORVERSION} -lt 6 ]]; then cp "M2Crypto-0.20.2-py2.5-macosx-10.5-ppc.egg" "${PKGROOT}/${SITELIBDIR}" && cp "easy-install.pth" "${PKGROOT}/${SITELIBDIR}"; fi ; fi # add default bcfg2.conf mkdir -p "${PKGROOT}/etc" cp "${CONF}" "${PKGROOT}/etc/${CONF}" |