diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-01-31 09:42:02 -0600 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-01-31 09:42:02 -0600 |
| commit | 943322205d4576e5ff5d1ee01373762aa5b7c1af (patch) | |
| tree | c5ac58b1507c4725222af7fee09c357a6e6a171c | |
| parent | 8dae884cba115d4013d3038d8b97d6e840d48d88 (diff) | |
| parent | 3af8bf0c6b69809b63d4b7c2d97b50161f92f6f2 (diff) | |
| download | bcfg2-943322205d4576e5ff5d1ee01373762aa5b7c1af.tar.gz bcfg2-943322205d4576e5ff5d1ee01373762aa5b7c1af.tar.bz2 bcfg2-943322205d4576e5ff5d1ee01373762aa5b7c1af.zip | |
Merge branch 'master' of https://github.com/rcuza/bcfg2
| -rw-r--r-- | osx/Makefile | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/osx/Makefile b/osx/Makefile index 698d060ab..1e16d7b6c 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 @@ -43,7 +45,7 @@ install: --root="osx/${PKGROOT}" \ --install-lib="${SITELIBDIR}" \ --install-data="${DATADIR}" - /usr/sbin/chown -R root:admin "${PKGROOT}" + #/usr/sbin/chown -R root:admin "${PKGROOT}" prepare: install mkdir ${PKGTMP} @@ -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}" |