From 100b9fd9aad33f7c126f33db3ee9ea05aefca539 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 1 Feb 2011 09:14:10 -0600 Subject: solaris: Fix build error Signed-off-by: Sol Jerome --- solaris/Makefile | 7 ++++--- solaris/prototype.bcfg2-server | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'solaris') diff --git a/solaris/Makefile b/solaris/Makefile index 730505cda..bd3d097d4 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -1,14 +1,15 @@ #!/usr/sfw/bin/gmake +PYTHON="/opt/csw/bin/python" VERS=1.2.0pre1-1 -PYVERSION := $(shell /opt/csw/bin/python -c "import sys; print sys.version[0:3]") +PYVERSION := $(shell $(PYTHON) -c "import sys; print sys.version[0:3]") default: clean package package: -mkdir tmp tmp/bcfg2-server tmp/bcfg2 - -cd ../ && /opt/csw/bin/python setup.py install --prefix=$(PWD) - -cat bin/bcfg2 | sed -e 's!/usr/bin/python!/opt/csw/bin/python!' > bin/bcfg2.new && mv bin/bcfg2.new bin/bcfg2 + -cd ../ && $(PYTHON) setup.py install --prefix=$(PWD) + -cat bin/bcfg2 | sed -e 's!/usr/bin/python!$(PYTHON)!' > bin/bcfg2.new && mv bin/bcfg2.new bin/bcfg2 # Set python version to whichever version is installed -cat prototype.bcfg2 | sed -e 's!PYVERSION!python$(PYVERSION)!' > prototype.bcfg2.fixed -cat prototype.bcfg2-server | sed -e 's!PYVERSION!python$(PYVERSION)!' > prototype.bcfg2-server.fixed diff --git a/solaris/prototype.bcfg2-server b/solaris/prototype.bcfg2-server index 4fc810cce..ee9e3a3a7 100644 --- a/solaris/prototype.bcfg2-server +++ b/solaris/prototype.bcfg2-server @@ -73,7 +73,6 @@ d none share/bcfg2 0755 bin bin d none share/bcfg2/schemas 0755 bin bin f none share/bcfg2/schemas/packages.xsd 0444 bin bin f none share/bcfg2/schemas/metadata.xsd 0444 bin bin -f none share/bcfg2/schemas/translation.xsd 0444 bin bin f none share/bcfg2/schemas/base.xsd 0444 bin bin f none share/bcfg2/schemas/services.xsd 0444 bin bin f none share/bcfg2/schemas/decisions.xsd 0444 bin bin -- cgit v1.2.3-1-g7c22