From 50d78fde85a6d2cee2e28f3681b4808b69133088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= <mail@kkaefer.com>
Date: Fri, 30 Jan 2015 11:48:29 +0100
Subject: fix install script

---
 utils/mbgl-config/build.sh                | 7 ++-----
 utils/mbgl-config/mbgl-config.template.sh | 8 +-------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'utils/mbgl-config')

diff --git a/utils/mbgl-config/build.sh b/utils/mbgl-config/build.sh
index fe7cbdf60a..f5e6c5d482 100755
--- a/utils/mbgl-config/build.sh
+++ b/utils/mbgl-config/build.sh
@@ -1,17 +1,14 @@
 #!/bin/bash
 
 PREFIX=$1
-PLATFORM=$2
-shift
-shift
+LDFLAGS=$2
 
 VARIABLES="#!/bin/bash
 
 ## variables
 
 CONFIG_MBGL_PREFIX=$PREFIX
-CONFIG_MBGL_PLATFORM=$PLATFORM
-CONFIG_MBGL_LDFLAGS=\"$@\"
+CONFIG_MBGL_LDFLAGS=\"`cat $LDFLAGS`\"
 "
 
 echo "$VARIABLES" | cat - utils/mbgl-config/mbgl-config.template.sh \
diff --git a/utils/mbgl-config/mbgl-config.template.sh b/utils/mbgl-config/mbgl-config.template.sh
index 89e28f64a8..f51120ad18 100644
--- a/utils/mbgl-config/mbgl-config.template.sh
+++ b/utils/mbgl-config/mbgl-config.template.sh
@@ -24,12 +24,6 @@ if test $# -eq 0; then
     usage 1
 fi
 
-if [ ${CONFIG_MBGL_PLATFORM} == 'linux' ]; then
-    LIBS="-Wl,--start-group -lmbgl-core -lmbgl-${CONFIG_MBGL_PLATFORM} -Wl,--end-group -lmbgl-headless"
-else
-    LIBS="-lmbgl-core -lmbgl-${CONFIG_MBGL_PLATFORM} -lmbgl-headless"
-fi
-
 while test $# -gt 0; do
     case "$1" in
     esac
@@ -49,7 +43,7 @@ while test $# -gt 0; do
       ;;
 
     --libs)
-      echo -L${CONFIG_MBGL_PREFIX}/lib ${LIBS} ${CONFIG_MBGL_LDFLAGS}
+      echo ${CONFIG_MBGL_PREFIX}/lib/libmbgl.a ${CONFIG_MBGL_LDFLAGS}
       ;;
 
     --includedir)
-- 
cgit v1.2.1