From f40ebf2c887dd82b7db49af2b7a238632b73c6c9 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 10 Jan 2010 12:02:44 +0100 Subject: [PATCH] Add __bash and use it in newpkg --- buildpkg.tools | 1 + newpkg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildpkg.tools b/buildpkg.tools index 27d42fc..699b9a0 100644 --- a/buildpkg.tools +++ b/buildpkg.tools @@ -1,6 +1,7 @@ # Global tool defintions for buildpkg # Define tool programs in rpm style __ prefixed namespace +__bash=/usr/tgcware/bin/bash __strip=/usr/bin/strip __uname=/usr/bin/uname __tar=/usr/tgcware/bin/tar # GNU tar v1.14 or better please! diff --git a/newpkg b/newpkg index 85d92b6..129b222 100644 --- a/newpkg +++ b/newpkg @@ -24,7 +24,7 @@ done ${__cp} $buildpkgscripts/build.sh.generic $arg1/build.sh 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 ${__cp} $buildpkgscripts/pkgdef.template.irix $arg1/meta/pkgdef fi