aboutsummaryrefslogtreecommitdiffstats
path: root/build_tools
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-19 00:33:27 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-11-19 00:33:27 +0000
commit296683f301336b411ceef41a96ebe5a9684fc6e0 (patch)
treee9d9f434078978cd43907a5473db8c7660760a21 /build_tools
parent0f7c0e30f548b8d3b403b61a54194a91a36f04b5 (diff)
Merged revisions 157600 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r157600 | seanbright | 2008-11-18 19:27:45 -0500 (Tue, 18 Nov 2008) | 10 lines Fix a few build problems on Solaris (and check for an md5 utility in configure instead of the icky loop I was doing before). (closes issue #13842) Reported by: snuffy Patches: bug13842_20081106.diff uploaded by snuffy (license 35) 13842.diff uploaded by seanbright (license 71) Tested by: snuffy ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@157601 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
-rwxr-xr-xbuild_tools/make_buildopts_h12
-rwxr-xr-xbuild_tools/make_version4
2 files changed, 3 insertions, 13 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
index 8409f805f..5159688af 100755
--- a/build_tools/make_buildopts_h
+++ b/build_tools/make_buildopts_h
@@ -27,17 +27,7 @@ then
TMP="${TMP} AST_DEVMODE"
fi
-case ${OSARCH} in # actually we should check build_os
-*BSD|mingw|darwin*)
- BUILDSUM=`echo ${TMP} | md5 | cut -c1-32`
- ;;
-SunOS)
- BUILDSUM=`echo ${TMP} | digest -a md5 | cut -c1-32`
- ;;
-*)
- BUILDSUM=`echo ${TMP} | md5sum | cut -c1-32`
- ;;
-esac
+BUILDSUM=`echo ${TMP} | ${MD5} | cut -c1-32`
echo "#define AST_BUILDOPT_SUM \"${BUILDSUM}\""
diff --git a/build_tools/make_version b/build_tools/make_version
index b7fdf8297..cf8201f8b 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -30,7 +30,7 @@ elif [ -d .svn ]; then
fi
if [ ${BRANCH} != 0 ] ; then
- if [ -z ${RESULT} ] ; then
+ if [ -z "${RESULT}" ] ; then
RESULT="${PART}"
else
RESULT="${RESULT}-${PART}"
@@ -39,7 +39,7 @@ elif [ -d .svn ]; then
fi
if [ ${TEAM} != 0 ] ; then
- if [ -z ${RESULT} ] ; then
+ if [ -z "${RESULT}" ] ; then
RESULT="${PART}"
else
RESULT="${RESULT}-${PART}"