From b3535db2aabf18a975a193f20ffaf0bde47dadbb Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 30 May 2007 14:32:04 -0400 Subject: makepkg: add srcdir and pkgdir variables We already have $startdir, so this introduces two more shorthand variables for the most commonly accessed directories. Signed-off-by: Dan McGee --- scripts/makepkg.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.in b/scripts/makepkg.in index d5f9f311..8eb52c97 100644 --- a/scripts/makepkg.in +++ b/scripts/makepkg.in @@ -35,7 +35,9 @@ TEXTDOMAINDIR='@localedir@' export TEXTDOMAINDIR myver='@PACKAGE_VERSION@' -startdir=$(pwd) +startdir="$(pwd)" +srcdir="$startdir/src" +pkgdir="$startdir/pkg" # Only use ABSROOT if we haven't been passed a SRCROOT on the command line. if [ -z "$SRCROOT" ]; then @@ -284,9 +286,9 @@ handledeps() { exit 1 fi success=0 - for pkgdir in $candidates; do - if [ -f "$pkgdir/$BUILDSCRIPT" ]; then - cd "$pkgdir" + for packagedir in $candidates; do + if [ -f "$packagedir/$BUILDSCRIPT" ]; then + cd "$packagedir" if [ "$RMDEPS" = "1" ]; then PKGDEST="$PKGDEST" makepkg -i -c -b -r else -- cgit v1.2.3-24-g4f1b