summaryrefslogtreecommitdiff
path: root/development/newtonsoft-json/newtonsoft-json.SlackBuild
diff options
context:
space:
mode:
authorRonny Schmatzler <schmatzler@hirnschwund.net>2014-08-18 23:13:35 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-08-20 01:40:54 +0700
commitef399d05679da2722e3ab27c7392e648edb76522 (patch)
tree48651d3d50807ff56d2ee8cf4f4e4cd53ca02dc1 /development/newtonsoft-json/newtonsoft-json.SlackBuild
parentb93ca2b4f3961111422a5f924de5bbde27b90c60 (diff)
downloadslackbuilds-ef399d05679da2722e3ab27c7392e648edb76522.tar.gz
development/newtonsoft-json: Updated for version 6.0.4.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'development/newtonsoft-json/newtonsoft-json.SlackBuild')
-rw-r--r--development/newtonsoft-json/newtonsoft-json.SlackBuild10
1 files changed, 6 insertions, 4 deletions
diff --git a/development/newtonsoft-json/newtonsoft-json.SlackBuild b/development/newtonsoft-json/newtonsoft-json.SlackBuild
index 0ca809a82c..4545fed4d9 100644
--- a/development/newtonsoft-json/newtonsoft-json.SlackBuild
+++ b/development/newtonsoft-json/newtonsoft-json.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=newtonsoft-json
-VERSION=${VERSION:-6.0.3}
+VERSION=${VERSION:-6.0.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -94,8 +94,10 @@ cd Src/Newtonsoft.Json/bin/Release/Net45
rm *.{xml,snk,il}
# Install Json into mono directory
-mkdir -p "$PKG/usr/lib${LIBDIRSUFFIX}/mono/newtonsoft-json/"
-find . -type f -exec install -Dm644 {} "$PKG/usr/lib${LIBDIRSUFFIX}/mono/newtonsoft-json/"{} \;
+# Libraries in the Global Assembly Cache are always in /usr/lib, regardless of the architecture
+# /usr/lib64/mono doesn't even get created when running mono.SlackBuild
+mkdir -p "$PKG/usr/lib/mono/newtonsoft-json/"
+find . -type f -exec install -Dm644 {} "$PKG/usr/lib/mono/newtonsoft-json/"{} \;
# Install pkg-config file
install -Dm644 "$CWD/newtonsoft.json.pc.in" "$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/newtonsoft.json.pc"
@@ -108,7 +110,7 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cat <<EOF > $PKG/install/doinst.sh
-gacutil -i /usr/lib${LIBDIRSUFFIX}/mono/newtonsoft-json/Newtonsoft.Json.dll -root "/usr/lib${LIBDIRSUFFIX}/"
+gacutil -i /usr/lib/mono/newtonsoft-json/Newtonsoft.Json.dll -root "/usr/lib/"
EOF
cd $PKG