diff options
author | Walter Doekes <walter+asterisk@wjd.nu> | 2013-04-08 18:24:50 +0000 |
---|---|---|
committer | Walter Doekes <walter+asterisk@wjd.nu> | 2013-04-08 18:24:50 +0000 |
commit | 5bf283d4060b2a8f90e347a42bbcfd40f5073942 (patch) | |
tree | cd2a4da359b95517ea489d63c8a7c3349e2beb9f /build_tools | |
parent | a5df2542c34544d4a274303c0c26581dbca5c301 (diff) |
Clean up Makefile "warning" clutter when makeopts doesn't exist.
Review: https://reviewboard.asterisk.org/r/2304
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@384989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'build_tools')
-rwxr-xr-x | build_tools/make_buildopts_h | 3 | ||||
-rwxr-xr-x | build_tools/make_linker_version_script | 3 | ||||
-rwxr-xr-x | build_tools/make_version | 8 | ||||
-rwxr-xr-x | build_tools/mkpkgconfig | 1 |
4 files changed, 12 insertions, 3 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h index 4f02896e4..55d08ba71 100755 --- a/build_tools/make_buildopts_h +++ b/build_tools/make_buildopts_h @@ -1,5 +1,8 @@ #!/bin/sh +GREP=${GREP:-grep} +MD5=${MD5:-md5sum} + cat << END /* * buildopts.h diff --git a/build_tools/make_linker_version_script b/build_tools/make_linker_version_script index 871ff4724..5d6bd42f3 100755 --- a/build_tools/make_linker_version_script +++ b/build_tools/make_linker_version_script @@ -1,5 +1,6 @@ #!/bin/sh +AWK=${AWK:-awk} + test -f ${1}.exports.in && ${AWK} "{sub(\"LINKER_SYMBOL_PREFIX\", \"${2}\"); print;}" ${1}.exports.in > ${1}.exports && exit 0 test -f ${1}.exports.in || rm -f ${1}.exports && cp ${3}/default.exports ${1}.exports && exit 0 - diff --git a/build_tools/make_version b/build_tools/make_version index de0b97e1a..d11c096eb 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -1,5 +1,9 @@ #!/bin/sh +AWK=${AWK:-awk} +GIT=${GIT:-git} +GREP=${GREP:-grep} + if [ -f ${1}/.version ]; then cat ${1}/.version elif [ -d ${1}/.svn ]; then @@ -92,7 +96,7 @@ elif [ -d ${1}/.git ]; then # If the first log commit messages indicates that this is checked into # subversion, we'll just use the SVN- form of the revision. MODIFIED="" - SVN_REV=`${GIT} log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"` + SVN_REV=`${GIT} log --pretty=full -1 | ${GREP} -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"` if [ -z "$SVN_REV" ]; then VERSION=GIT-`${GIT} describe --long --always --tags --dirty=M 2> /dev/null` if [ $? -ne 0 ]; then @@ -105,7 +109,7 @@ elif [ -d ${1}/.git ]; then fi echo ${VERSION} else - PARTS=`LANG=C ${GIT} log --pretty=full | grep -F "git-svn-id:" | head -1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'` + PARTS=`LANG=C ${GIT} log --pretty=full | ${GREP} -F "git-svn-id:" | head -1 | ${AWK} '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'` BRANCH=0 TEAM=0 TAG=0 diff --git a/build_tools/mkpkgconfig b/build_tools/mkpkgconfig index 08ecb924e..fd7d90686 100755 --- a/build_tools/mkpkgconfig +++ b/build_tools/mkpkgconfig @@ -1,5 +1,6 @@ #!/bin/sh PPATH="$1" +GREP=${GREP:-grep} ## Make sure we were called from Makefile if [ "x$ASTERISKVERSIONNUM" = "x" ]; then |