\

generic.SlackBuild v0.2.3
  - O fonte e descompactado no $SRC_DIR e nao mais no $CWD

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@945 370017ae-e619-0410-ac65-c121f96126d4

diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild
index 85e079f93efb23d18d6869a6064ee6254e1b6af2..6dc6e23a4ec97e850e777992228c89a2012ea111 100755 (executable)
--- a/app/crypt/gnupg2/gnupg2.SlackBuild
+++ b/app/crypt/gnupg2/gnupg2.SlackBuild
@@ -26,7 +26,7 @@ TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
 PREFIX=${PREFIX:=/usr}
-PKG_SRC=$SRC_NAME-$VERSION
+PKG_SRC=$SRC_DIR/$SRC_NAME-$VERSION
 
 # Set system libraries' path and optmization flags based on $ARCH
 LIBDIR=$PREFIX/lib
@@ -91,8 +91,8 @@ fi
 gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG
 
 # Untar, patch, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC || exit $ERROR_TAR
-cd $PKG_SRC/g10
+tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR
+cd $SRC_DIR/$PKG_SRC/g10
 patch -Np0 < $CWD/filter-context-20-small.diff || exit $ERROR_PATCH
 cd ..
 CFLAGS="$SLKCFLAGS" \

diff --git a/others/generic/generic.SlackBuild b/others/generic/generic.SlackBuild
index a19067856cf82da6f5a6e6db3ae94549fa4c804a..79882a3bcc35f3ff409dc8927088ab0a5c15e231 100755 (executable)
--- a/others/generic/generic.SlackBuild
+++ b/others/generic/generic.SlackBuild
@@ -1,7 +1,7 @@
 ################################################
 ## Generic template for SlackBuilds
 ##
-## Version 0.2.2 - Luis
+## Version 0.2.3 - Luis
 ##
 ################################################
 #!/bin/bash
@@ -86,8 +86,8 @@ fi
 gpg --verify $SRC_DIR/$SRC.sig $SRC_DIR/$SRC || exit $ERROR_GPG
 
 # Untar, patch, configure, compile and install
-tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC || exit $ERROR_TAR
-cd $PKG_SRC
+tar --no-same-owner --no-same-permissions -xvf $SRC_DIR/$SRC -C $SRC_DIR || exit $ERROR_TAR
+cd $SRC_DIR/$PKG_SRC
 patch -Np[[NUMBER OF PREFIX SLASHES TO STRIP]] < $CWD/[[PATCH FILE]]
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
@@ -156,5 +156,5 @@ makepkg -l y -c n $REPOS/$PKG_NAME-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPK
 
 # Delete source and build directories, if requested
 if [ "$CLEANUP" == "yes" ]; then
-  rm -rf $CWD/$PKG_SRC $PKG
+  rm -rf $SRC_DIR/$PKG_SRC $PKG
 fi