diff options
| author | Nezmer <git@nezmer.info> | 2010-01-19 20:05:06 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-01-19 21:51:51 -0600 |
| commit | afc37c58c74848a11adb04b0ae182cca467cd25e (patch) | |
| tree | f016064ea95a4825554b716b74ee728e6ee5bf02 | |
| parent | a6cca6e456e9b84362e00b5e5209059a20df965c (diff) | |
| download | pacman-afc37c58c74848a11adb04b0ae182cca467cd25e.tar.xz | |
makepkg: Introduce $SRCPKGDEST
Introduce $SRCPKGDEST to define a destination dir for source packages
instead of saving them in $PKGDEST with binary packages.
The simple patch doesn't break old behavior.
Signed-off-by: Nezmer <git@nezmer.info>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | etc/makepkg.conf.in | 2 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in index 3a3a4154..b92a6975 100644 --- a/etc/makepkg.conf.in +++ b/etc/makepkg.conf.in @@ -91,6 +91,8 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod) #PKGDEST=/home/packages #-- Source cache: specify a fixed directory where source files will be cached #SRCDEST=/home/sources +#-- Source packages: specify a fixed directory where all src packages will be placed +#SRCPKGDEST=/home/srcpackages #-- 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 5bbd8809..5bd294c1 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1108,7 +1108,7 @@ create_srcpackage() { "$SRCEXT" ;; esac - local pkg_file="$PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" + local pkg_file="$SRCPKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT}" # tar it up msg2 "$(gettext "Compressing source package...")" @@ -1575,6 +1575,7 @@ done #preserve environment variables _PKGDEST=${PKGDEST} _SRCDEST=${SRCDEST} +_SRCPKGDEST=${SRCPKGDEST} # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} @@ -1613,6 +1614,8 @@ PKGDEST=${_PKGDEST:-$PKGDEST} PKGDEST=${PKGDEST:-$startdir} #default to $startdir if undefined SRCDEST=${_SRCDEST:-$SRCDEST} SRCDEST=${SRCDEST:-$startdir} #default to $startdir if undefined +SRCPKGDEST=${_SRCPKGDEST:-$SRCPKGDEST} +SRCPKGDEST=${SRCPKGDEST:-$PKGDEST} #default to $PKGDEST if undefined if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then @@ -1838,7 +1841,7 @@ msg "$(gettext "Making package: %s")" "$pkgbase $pkgver-$pkgrel ($(date))" # if we are creating a source-only package, go no further if (( SOURCEONLY )); then - if [[ -f $PKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT} ]] \ + if [[ -f $SRCPKGDEST/${pkgbase}-${pkgver}-${pkgrel}${SRCEXT} ]] \ && (( ! FORCE )); then error "$(gettext "A source package has already been built. (use -f to overwrite)")" exit 1 |