[gnome-sdk-images/arm-fixes: 2/3] Fix libdir for arm

[Javier Jardón Cabezas <jjardon src gnome org>]

commit 80b7eee3f20b40e96193382b5301861f02b94baa
Author: Valentin David <valentin david gmail com>
Date:   Mon Jun 25 08:50:04 2018 +0000

    Fix libdir for arm

 Makefile              | 17 ++++++++++++-----
 org.gnome.Sdk.json.in |  8 ++++----
 2 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/Makefile b/Makefile
index 8d8c465..039d271 100644
--- a/Makefile
+++ b/Makefile
@@ -10,15 +10,22 @@ REPO   ?= repo
 SDK_BRANCH=master
 SDK_RUNTIME_VERSION=unstable
 
+ifeq ($(ARCH),arm)
+LIB=lib/arm-linux-gnueabihf
+else
+LIB=lib/$(ARCH)-linux-gnu
+endif
+
 # Canned recipe for generating metadata
 SUBST_FILES=org.gnome.Sdk.json os-release issue issue.net org.gnome.Platform.appdata.xml 
org.gnome.Sdk.appdata.xml
 define subst-metadata
        @echo -n "Generating files: ${SUBST_FILES}... ";
-       @for file in ${SUBST_FILES}; do                                         \
-         file_source=$${file}.in;                                              \
-         sed -e 's/@@SDK_ARCH@@/${ARCH}/g'                                     \
-             -e 's/@@SDK_BRANCH@@/${SDK_BRANCH}/g'                             \
-             -e 's/@@SDK_RUNTIME_VERSION@@/${SDK_RUNTIME_VERSION}/g'           \
+       @for file in ${SUBST_FILES}; do                                         \
+         file_source=$${file}.in;                                              \
+         sed -e 's/@@SDK_ARCH@@/${ARCH}/g'                                     \
+             -e 's/@@SDK_BRANCH@@/${SDK_BRANCH}/g'                             \
+             -e 's/@@SDK_RUNTIME_VERSION@@/${SDK_RUNTIME_VERSION}/g'           \
+             -e 's,@@SDK_LIB@@,${LIB},g'                                       \
              $$file_source > $$file.tmp && mv $$file.tmp $$file || exit 1;     \
        done
        @echo "Done.";
diff --git a/org.gnome.Sdk.json.in b/org.gnome.Sdk.json.in
index 76ebc04..1351bd6 100644
--- a/org.gnome.Sdk.json.in
+++ b/org.gnome.Sdk.json.in
@@ -28,7 +28,7 @@
     },
     "finish-args": [
         "--env=GI_TYPELIB_PATH=/app/lib/girepository-1.0",
-        
"--env=GST_PLUGIN_PATH=/app/lib/gstreamer-1.0:/usr/lib/@@SDK_ARCH@@-linux-gnu/extensions/gstreamer-1.0",
+        "--env=GST_PLUGIN_PATH=/app/lib/gstreamer-1.0:/usr/@@SDK_LIB@@/extensions/gstreamer-1.0",
         "--env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/share",
         "--sdk=org.gnome.Sdk//@@SDK_BRANCH@@",
         "--runtime=org.gnome.Platform//@@SDK_BRANCH@@"
@@ -827,7 +827,7 @@
             "buildsystem": "cmake",
             "config-opts": [
                 "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
-                "-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib/@@SDK_ARCH@@-linux-gnu"
+                "-DCMAKE_INSTALL_LIBDIR:PATH=/usr/@@SDK_LIB@@"
             ],
             "sources": [
                 {
@@ -841,7 +841,7 @@
             "buildsystem": "cmake",
             "config-opts": [
                 "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
-                "-DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib/@@SDK_ARCH@@-linux-gnu"
+                "-DCMAKE_INSTALL_LIBDIR:PATH=/usr/@@SDK_LIB@@"
             ],
             "sources": [
                 {
@@ -876,7 +876,7 @@
                 "-DPORT=GTK",
                 "-DCMAKE_BUILD_TYPE=Release",
                 "-DCMAKE_INSTALL_PREFIX:PATH=/usr",
-                "-DLIB_INSTALL_DIR:PATH=/usr/lib/@@SDK_ARCH@@-linux-gnu",
+                "-DLIB_INSTALL_DIR:PATH=/usr/@@SDK_LIB@@",
                 "-DSYSCONF_INSTALL_DIR:PATH=/usr/etc",
                 "-DSHARE_INSTALL_PREFIX:PATH=/usr/share",
                 "-DINCLUDE_INSTALL_DIR:PATH=/usr/include",