moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-02-28 09:21:53 -05:00
Code Issues Releases Wiki Activity

Remove mentions of ABS from makepkg

Browse Source 
Kill off some of the $ABSROOT stuff that was still hanging around in there.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2008-01-02 20:43:15 -06:00
parent 601a85082d
commit c26039240d
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/makepkg.8.txt
View File

@ -41,15 +41,15 @@ Options
*-b, \--builddeps*:: *-b, \--builddeps*::
Build missing dependencies from source. When makepkg finds missing Build missing dependencies from source. When makepkg finds missing
build-time or run-time dependencies, it will look for the dependencies' 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 PKGBUILD files under `SRCROOT` (set in linkman:makepkg.conf[5]). If it
will call makepkg to build and install the missing dependencies. The finds them it will call makepkg to build and install the missing
child calls will be made with the `-b` and `-i` options. dependencies. The child calls will be made with the `-b` and `-i` options.
*-c, \--clean*:: *-c, \--clean*::
Clean up leftover work files and directories after a successful build. Clean up leftover work files and directories after a successful build.
*-C, \--cleancache*:: *-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]. in linkman:makepkg.conf[5].
*-d, \--nodeps*:: *-d, \--nodeps*::
@ -67,7 +67,7 @@ Options
*-f, \--force*:: *-f, \--force*::
makepkg will not build a package if a built package already exists in 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 default to the current directory. This allows the built package to be
overwritten. overwritten.

2
etc/makepkg.conf.in
View File

@ -83,6 +83,8 @@ DOC_DIRS=(usr/{,share/}{info,doc,gtk-doc} opt/gnome/{,share/}{info,doc,gtk-doc})
#PKGDEST=/home/packages #PKGDEST=/home/packages
#-- Source cache: specify a fixed directory where source files will be cached #-- Source cache: specify a fixed directory where source files will be cached
#SRCDEST=/home/sources #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: name/email of the person or organization building packages
#PACKAGER="John Doe <john@doe.com>" #PACKAGER="John Doe <john@doe.com>"

11
scripts/makepkg.sh.in
View File

@ -1114,17 +1114,6 @@ PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined
SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${_SRCDEST:-$SRCDEST}
SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined 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. # Parse Command Line Options.
OPT_SHORT="AbcCdefFghiLmop:rRsSV" OPT_SHORT="AbcCdefFghiLmop:rRsSV"
OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,geninteg,help,install,log" OPT_LONG="ignorearch,asroot,builddeps,clean,cleancache,nodeps,noextract,force,geninteg,help,install,log"