summaryrefslogtreecommitdiffstats
path: root/osx/Makefile
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2011-05-10 11:24:28 -0500
committerNarayan Desai <desai@mcs.anl.gov>2011-05-10 11:24:28 -0500
commit0e75875e9bd9900a6a3c7ab118c448e48829eaef (patch)
tree391204747f48598c4e978d3724afbd5b8aa1d12c /osx/Makefile
parentf2d218ccd2de93ef639347933ba127ef081b4401 (diff)
parent91634f9a3b888eee3cd5f9a777fcb075fc666c9a (diff)
downloadbcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.tar.gz
bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.tar.bz2
bcfg2-0e75875e9bd9900a6a3c7ab118c448e48829eaef.zip
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'osx/Makefile')
-rw-r--r--osx/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/osx/Makefile b/osx/Makefile
index bd16a4227..075628668 100644
--- a/osx/Makefile
+++ b/osx/Makefile
@@ -14,7 +14,7 @@ FILTERS = --filter Hostbase \
--filter bcfg2-build-reports \
--filter bcfg2-info \
--filter bcfg2-ping-sweep \
---filter bcfg2-repo-validate \
+--filter bcfg2-lint \
--filter bcfg2-reports \
--filter bcfg2-server
@@ -41,14 +41,14 @@ default: clean client
install:
echo "Installing Bcfg2 to ${PKGROOT}"
- mkdir ${PKGROOT}
+ mkdir -p ${PKGROOT}
cd ../ && /usr/bin/python setup.py install \
--root="osx/${PKGROOT}" \
--install-lib="${SITELIBDIR}" \
--install-data="${DATADIR}"
prepare: install
- mkdir ${PKGTMP}
+ mkdir -p ${PKGTMP}
cp ${PROTO_PLIST} ${PKGTMP}
sed -i '' "s/{SHORTVERSION}/${BCFGVER}/g" "${PKGTMP}/${PROTO_PLIST}"
sed -i '' "s/{MAJORVERSION}/${MAJOR}/g" "${PKGTMP}/${PROTO_PLIST}"