Merge branch 'master.upstream' into staging.upstream

2015-08-13 11:55:02 -07:00
parent 257db17ee9 bc9bd5c02c
commit 952def0e3c
146 changed files with 14613 additions and 9539 deletions
@@ -22,7 +22,7 @@ wrapGAppsHook() {
  fi

  if [ -d "$prefix/share" ]; then
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$out/share")
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "$prefix/share")
  fi

  for v in $wrapPrefixVariables GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do