From 96c62a78b61d993eaeae2ca136085bffc2c5fc7c Mon Sep 17 00:00:00 2001
From: rudson <rudson@04377dda-e619-0410-9926-eae83683ac58>
Date: Wed, 28 Nov 2007 17:36:31 +0000
Subject: várias mudanças: lspkg, createpkg, mkbuild, common.sh,
 simplepkg.conf.new, generic.mkSlackBuild, model.mkbuild
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@458 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/mkbuild/generic.mkSlackBuild | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'trunk/mkbuild/generic.mkSlackBuild')

diff --git a/trunk/mkbuild/generic.mkSlackBuild b/trunk/mkbuild/generic.mkSlackBuild
index 72f8917..6e9e222 100644
--- a/trunk/mkbuild/generic.mkSlackBuild
+++ b/trunk/mkbuild/generic.mkSlackBuild
@@ -50,7 +50,7 @@ TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=[[PREFIX]]}
-PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION"
+PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="[[OTHER CONFIGURE ARGS]]"}
 NUMJOBS=${NUMJOBS:="[[NUMBER OF JOBS]]"}
 </set_variables>
@@ -90,6 +90,8 @@ rm -rf "$PKG" 2> /dev/null
 mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
 mkdir -p "$PKG" || exit $ERROR_MKDIR
 mkdir -p "$REPOS" || exit $ERROR_MKDIR
+mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
+
 </start_structure>
 
 <download_source> off
@@ -138,8 +140,9 @@ gpg --verify "$SRC_DIR/$SRC.sig" "$SRC_DIR/$SRC" || exit $ERROR_GPG
 
 <untar_source> off
 # Untar
-cd "$TMP"
+cd "$PKG_WORK"
 [[UNPACKER]] [[UNPACKER FLAGS]] "$SRC_DIR/$SRC" || exit $ERROR_TAR
+PKG_SRC=`ls -l | awk '/^d/ { print $8 }'`
 cd "$PKG_SRC"
 </untar_source>
 
-- 
cgit v1.2.3