aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2008-05-03 19:21:36 +0000
committerrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2008-05-03 19:21:36 +0000
commitbc61fcf9f04a1c720711d44177dae95325d4a134 (patch)
tree563b11abcd5690a9c3360c8d480094dcb20c605b
parent6f58290127fcb6582df5d1718f71866edd3cb4a4 (diff)
downloadslackbuilds-bc61fcf9f04a1c720711d44177dae95325d4a134.tar.gz
slackbuilds-bc61fcf9f04a1c720711d44177dae95325d4a134.tar.bz2
boost: underline version workaround fix again
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1870 370017ae-e619-0410-ac65-c121f96126d4
-rwxr-xr-xdev/libs/boost/boost.SlackBuild2
-rwxr-xr-xdev/libs/boost/boost.build5
2 files changed, 4 insertions, 3 deletions
diff --git a/dev/libs/boost/boost.SlackBuild b/dev/libs/boost/boost.SlackBuild
index 67355636..8d6adb5e 100755
--- a/dev/libs/boost/boost.SlackBuild
+++ b/dev/libs/boost/boost.SlackBuild
@@ -42,7 +42,7 @@ fi
PACKAGE="boost"
ARCH=${ARCH:=i486}
VERSION=${VERSION:=1.35.0}
-BUILD=${BUILD:=2rd}
+BUILD=${BUILD:=1rd}
SRC_DIR=${SRC:=$CWD}
TMP=${TMP:=/tmp}
REPOS=${REPOS:=$TMP}
diff --git a/dev/libs/boost/boost.build b/dev/libs/boost/boost.build
index ab4c6dab..50b775d4 100755
--- a/dev/libs/boost/boost.build
+++ b/dev/libs/boost/boost.build
@@ -30,7 +30,7 @@ fi
PACKAGE="boost"
ARCH=${ARCH:=i486}
VERSION=${VERSION:=1.35.0}
-BUILD=${BUILD:=2rd}
+BUILD=${BUILD:=1rd}
SRC_DIR=${SRC:=$CWD}
TMP=${TMP:=/tmp}
REPOS=${REPOS:=$TMP}
@@ -88,7 +88,8 @@ make install || exit $ERROR_INSTALL
CWD="`pwd`"
# Underline version without minor version if minor version is 0 (workaround)
-cd /usr/include && ln -s /usr/include/boost-`echo $VERSION_UNDERLINE | sed -e 's/\([0-9]\+\)_\([0-9]\+\)_0/\1_\2/'`/ /usr/include/boost
+VERSION_UNDERLINE="`echo $VERSION | sed -e 's/\([0-9]\+\)_\([0-9]\+\)_0/\1_\2/'`"
+cd /usr/include && ln -s boost-$VERSION_UNDERLINE/ boost
# docs
mkdir -p /usr/doc/$PACKAGE-$VERSION