diff options
| author | Dan McGee <dan@archlinux.org> | 2008-01-02 20:43:15 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-01-05 14:35:40 -0600 |
| commit | c26039240db12794ad3f5b3d87c498b61a75e95b (patch) | |
| tree | 1de5789f0758be8633862b174679e88fbbfc11fe | |
| parent | 601a85082d2965174925a85942e9e8a5a0e9f735 (diff) | |
| download | pacman-c26039240db12794ad3f5b3d87c498b61a75e95b.tar.xz | |
Remove mentions of ABS from makepkg
Kill off some of the $ABSROOT stuff that was still hanging around in there.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | doc/makepkg.8.txt | 10 | ||||
| -rw-r--r-- | etc/makepkg.conf.in | 2 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 11 |
3 files changed, 7 insertions, 16 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index d341fc9f..8cafae22 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -41,15 +41,15 @@ Options *-b, \--builddeps*:: Build missing dependencies from source. When makepkg finds missing build-time or run-time dependencies, it will look for the dependencies' - PKGBUILD files under ABSROOT (set in makepkg.conf). If it finds them it - will call makepkg to build and install the missing dependencies. The - child calls will be made with the `-b` and `-i` options. + PKGBUILD files under `SRCROOT` (set in linkman:makepkg.conf[5]). If it + finds them it will call makepkg to build and install the missing + dependencies. The child calls will be made with the `-b` and `-i` options. *-c, \--clean*:: Clean up leftover work files and directories after a successful build. *-C, \--cleancache*:: - Removes all cached source files from the directory specified in SRCDEST + Removes all cached source files from the directory specified in `SRCDEST` in linkman:makepkg.conf[5]. *-d, \--nodeps*:: @@ -67,7 +67,7 @@ Options *-f, \--force*:: makepkg will not build a package if a built package already exists in - the PKGDEST (set in linkman:makepkg.conf[5]) directory, which may + the `PKGDEST` (set in linkman:makepkg.conf[5]) directory, which may default to the current directory. This allows the built package to be overwritten. diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index d13c3d69..d808270d 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -83,6 +83,8 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc}) #PKGDEST=/home/packages #-- Source cache: specify a fixed directory where source files will be cached #SRCDEST=/home/sources +#-- Source root: specify location where PKGBUILDs are located for '--builddeps' +#SRCROOT=/home/pkgbuilds #-- Packager: name/email of the person or organization building packages #PACKAGER="John Doe <john@doe.com>" diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 3feb9cb0..99b524c9 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1114,17 +1114,6 @@ PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined -# Only use ABSROOT if we haven't been passed a SRCROOT on the command line. -if [ -z "$SRCROOT" ]; then - if [ -r "$confdir/abs/abs.conf" ]; then - source "$confdir/abs/abs.conf" - fi - if [ -r ~/.abs.conf ]; then - source ~/.abs.conf - fi - SRCROOT=$ABSROOT -fi - # Parse Command Line Options. OPT_SHORT="AbcCdefFghiLmop:rRsSV" OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,geninteg,help,install,log" |