diff options
| author | Dan McGee <dan@archlinux.org> | 2007-05-30 14:32:04 -0400 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-05-30 14:32:04 -0400 |
| commit | b3535db2aabf18a975a193f20ffaf0bde47dadbb (patch) | |
| tree | dbdad998c77a040fc64f568e7ab5d38c04ca1333 | |
| parent | f4d6efeee0fcebb726b54463fbba1c6eb51cfaff (diff) | |
| download | pacman-b3535db2aabf18a975a193f20ffaf0bde47dadbb.tar.xz | |
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 <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.in | 10 |
1 files 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 |