mirror of
https://github.com/moparisthebest/pacman
synced 2024-08-13 17:03:46 -04:00
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>
This commit is contained in:
parent
f4d6efeee0
commit
b3535db2aa
@ -35,7 +35,9 @@ TEXTDOMAINDIR='@localedir@'
|
|||||||
export TEXTDOMAINDIR
|
export TEXTDOMAINDIR
|
||||||
|
|
||||||
myver='@PACKAGE_VERSION@'
|
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.
|
# Only use ABSROOT if we haven't been passed a SRCROOT on the command line.
|
||||||
if [ -z "$SRCROOT" ]; then
|
if [ -z "$SRCROOT" ]; then
|
||||||
@ -284,9 +286,9 @@ handledeps() {
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
success=0
|
success=0
|
||||||
for pkgdir in $candidates; do
|
for packagedir in $candidates; do
|
||||||
if [ -f "$pkgdir/$BUILDSCRIPT" ]; then
|
if [ -f "$packagedir/$BUILDSCRIPT" ]; then
|
||||||
cd "$pkgdir"
|
cd "$packagedir"
|
||||||
if [ "$RMDEPS" = "1" ]; then
|
if [ "$RMDEPS" = "1" ]; then
|
||||||
PKGDEST="$PKGDEST" makepkg -i -c -b -r
|
PKGDEST="$PKGDEST" makepkg -i -c -b -r
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user