summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Staniewski <cedric@gmx.ca>2011-02-01 15:59:35 +0100
committerDan McGee <dan@archlinux.org>2011-02-02 18:46:39 -0600
commitd8c4b12c66f1b4851eac5b61c7455a05d891ac70 (patch)
treef6fb61be2e359d56375006eb8324c38f9c73745c
parent332dd86912515dda5703127d13fd21f96e8273b9 (diff)
downloadpacman-d8c4b12c66f1b4851eac5b61c7455a05d891ac70.tar.xz
makepkg: make SRCPKGDEST default to $startdir
The current behaviour, which is placing source packages in PKGDEST if SRCPKGDEST is not set, is inconsistent with {SRC,PKG}DEST handling and there is no real advantage in doing so. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/makepkg.conf.5.txt4
-rw-r--r--scripts/makepkg.sh.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt
index 020804cb..61302492 100644
--- a/doc/makepkg.conf.5.txt
+++ b/doc/makepkg.conf.5.txt
@@ -183,8 +183,8 @@ Options
**SRCPKGDEST=**"/path/to/folder"::
If this value is not set, source package files will be stored in
- PKGDEST. Many people like to keep all source package files in
- a central location for easy cleanup, so this path can be set here.
+ in the current directory. Many people like to keep all source package files
+ in a central location for easy cleanup, so this path can be set here.
**PACKAGER=**"John Doe <john@example.com>"::
This value is used when querying a package to see who was the builder.
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index a898b5ad..ebafa0b7 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1744,7 +1744,7 @@ if [[ ! -w $SRCDEST ]] ; then
fi
SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST}
-SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined
+SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined
if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then