From a8e1d43135fe8a399168eaaa88e27123bc718c0a Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Wed, 4 Aug 2010 21:50:54 +0200
Subject: [PATCH] config/path: include meta file earlyer, $PKG_BUILD now uses
 metafile if possible

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/path | 49 +++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/config/path b/config/path
index 828966cda6..d67136ee71 100644
--- a/config/path
+++ b/config/path
@@ -38,7 +38,6 @@ TARGET=target
 ADDONS=addons
 BUILD=$BUILD_BASE.OpenELEC-$PROJECT.$TARGET_ARCH.$OPENELEC_VERSION
 [ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM
-PKG_BUILD=$BUILD/$1\[-_][0-9]*
 TARGET_IMG=$ROOT/$TARGET
 TARGET_ADDONS="$TARGET_IMG/$ADDONS/$ADDON_PATH"
 ADDON_BUILD="$BUILD/$ADDONS/$1"
@@ -71,6 +70,33 @@ MAKE="$ROOT/$TOOLCHAIN/bin/make"
 MAKEINSTALL="$ROOT/$TOOLCHAIN/bin/make DESTDIR=$SYSROOT_PREFIX install"
 SED="sed -i"
 
+# set package metadata
+  PKG_NAME="$1"
+  PKG_VERSION="0.0invalid"
+  PKG_REV="0"
+  PKG_ARCH="any"
+  PKG_LICENSE="unknown"
+  PKG_SITE=""
+  PKG_URL=""
+  PKG_DEPENDS=""
+  PKG_BUILD_DEPENDS=""
+  PKG_PRIORITY="optional"
+  PKG_SECTION="misc"
+  PKG_SHORTDESC="$1 (autogenerated)"
+  PKG_LONGDESC=""
+  PKG_IS_ADDON="no"
+
+  [ -n "$1" ] && PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
+
+  [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
+  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="addon.$PKG_SECTION.$PKG_NAME"
+
+if [ -r $PKG_DIR/meta ]; then
+  PKG_BUILD=$BUILD/${PKG_NAME}\[-_]${PKG_VERSION}
+else
+  PKG_BUILD=$BUILD/$1\[-_][0-9]*
+fi
+
 XORG_PATH_ENCODINGS=/usr/share/X11/encodings
 XORG_PATH_FONTS=/usr/share/X11/fonts
 XORG_PATH_MAPS=$XORG_PATH_FONTS/util
@@ -243,27 +269,6 @@ INDENT_SIZE=4
 VERSION_SUFFIX=$TARGET_ARCH
 [ -n "$TARGET_PLATFORM" ] && VERSION_SUFFIX=$TARGET_PLATFORM
 
-# set package metadata
-  PKG_NAME="$1"
-  PKG_VERSION="0.0invalid"
-  PKG_REV="0"
-  PKG_ARCH="any"
-  PKG_LICENSE="unknown"
-  PKG_SITE=""
-  PKG_URL=""
-  PKG_DEPENDS=""
-  PKG_BUILD_DEPENDS=""
-  PKG_PRIORITY="optional"
-  PKG_SECTION="misc"
-  PKG_SHORTDESC="$1 (autogenerated)"
-  PKG_LONGDESC=""
-  PKG_IS_ADDON="no"
-
-  [ -n "$1" ] && PKG_DIR=`find $PACKAGES -type d -name $1 2>/dev/null`
-
-  [ -r $PKG_DIR/meta ] && . $PKG_DIR/meta
-  [ "$PKG_IS_ADDON" = "yes" ] && PKG_ADDON_ID="addon.$PKG_SECTION.$PKG_NAME"
-
 # read generic personal options if available
  if [ -f ~/.openelec/options ]; then
    . ~/.openelec/options