diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-05-22 13:46:02 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-05-23 08:01:07 -0500 |
| commit | c41e0094f8b8baedecbc5dcc7a66decd3c087887 (patch) | |
| tree | 7cb70df25e3ffe31a987d1a9fda85be55194702c | |
| parent | ba48c23030259f46174645d6af3ffda186fa279a (diff) | |
| download | bcfg2-c41e0094f8b8baedecbc5dcc7a66decd3c087887.tar.gz bcfg2-c41e0094f8b8baedecbc5dcc7a66decd3c087887.tar.bz2 bcfg2-c41e0094f8b8baedecbc5dcc7a66decd3c087887.zip | |
solaris: Fix build errors
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | solaris/Makefile | 4 | ||||
| -rw-r--r-- | solaris/gen-prototypes.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solaris/Makefile b/solaris/Makefile index 77d9019eb..5e590aade 100644 --- a/solaris/Makefile +++ b/solaris/Makefile @@ -12,8 +12,8 @@ package: -cd ../ && PYTHONPATH=$(PYTHONPATH):$(PWD)/build/lib/python2.6/site-packages/ $(PYTHON) setup.py install --single-version-externally-managed --record=/dev/null --prefix=$(PWD)/build #setuptools appears to use a restictive umask -chmod -R o+r build/ - -cat bin/bcfg2 | sed -e 's!/usr/bin/python!$(PYTHON)!' > bin/bcfg2.new && mv bin/bcfg2.new bin/bcfg2 - -./gen-prototypes.sh + -cat build/bin/bcfg2 | sed -e 's!/usr/bin/python!$(PYTHON)!' > build/bin/bcfg2.new && mv build/bin/bcfg2.new build/bin/bcfg2 + -sh ./gen-prototypes.sh -pkgmk -o -a `uname -m` -f prototype.bcfg2 -d $(PWD)/tmp -r $(PWD)/build -pkgmk -o -a `uname -m` -f prototype.bcfg2-server -d $(PWD)/tmp -r $(PWD)/build -pkgtrans -o -s $(PWD)/tmp $(PWD)/bcfg2-$(VERS) SCbcfg2 diff --git a/solaris/gen-prototypes.sh b/solaris/gen-prototypes.sh index ea0b4bb13..64aff9edb 100644 --- a/solaris/gen-prototypes.sh +++ b/solaris/gen-prototypes.sh @@ -1,6 +1,6 @@ #!/bin/sh cd build -PP="./"`ls -1d lib/*`"/site-packages/" +PP="./lib/python/site-packages/" #bcfg2 echo "i pkginfo=./pkginfo.bcfg2" > ../prototype.tmp |