Add __bash and use it in newpkg

This commit is contained in:
Tom G. Christensen 2010-01-10 12:02:44 +01:00
parent b17d5ad85f
commit f40ebf2c88
2 changed files with 2 additions and 1 deletions

View File

@ -1,6 +1,7 @@
# Global tool defintions for buildpkg # Global tool defintions for buildpkg
# Define tool programs in rpm style __ prefixed namespace # Define tool programs in rpm style __ prefixed namespace
__bash=/usr/tgcware/bin/bash
__strip=/usr/bin/strip __strip=/usr/bin/strip
__uname=/usr/bin/uname __uname=/usr/bin/uname
__tar=/usr/tgcware/bin/tar # GNU tar v1.14 or better please! __tar=/usr/tgcware/bin/tar # GNU tar v1.14 or better please!

2
newpkg
View File

@ -24,7 +24,7 @@ done
${__cp} $buildpkgscripts/build.sh.generic $arg1/build.sh ${__cp} $buildpkgscripts/build.sh.generic $arg1/build.sh
if [ "$(${__uname} -s)" == "IRIX" -o "$(${__uname} -s)" == "IRIX64" ]; then if [ "$(${__uname} -s)" == "IRIX" -o "$(${__uname} -s)" == "IRIX64" ]; then
${__sed} -e 's;bin/bash;usr/tgcware/bin/bash;g' $arg1/build.sh > $arg1/build.sh.tmp ${__sed} -e "s;/bin/bash;$__bash;g" $arg1/build.sh > $arg1/build.sh.tmp
${__mv} $arg1/build.sh.tmp $arg1/build.sh ${__mv} $arg1/build.sh.tmp $arg1/build.sh
${__cp} $buildpkgscripts/pkgdef.template.irix $arg1/meta/pkgdef ${__cp} $buildpkgscripts/pkgdef.template.irix $arg1/meta/pkgdef
fi fi