snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

xbps-src: make sure that XBPS_BUILDDIR doesn't have multiple '/' (stupid firefox).

This commit is contained in:
Juan RP 2011-11-05 11:55:02 +01:00
parent 1409ec5fcd
commit d21fc0ae41
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
xbps-src/shutils/init_funcs.sh.in
View File

@ -37,8 +37,10 @@ set_defvars()
XBPS_SRCPKGDIR=$XBPS_DISTRIBUTIONDIR/srcpkgs XBPS_SRCPKGDIR=$XBPS_DISTRIBUTIONDIR/srcpkgs
if [ -n "$IN_CHROOT" ]; then if [ -n "$IN_CHROOT" ]; then
XBPS_DESTDIR=/destdir XBPS_DESTDIR=/destdir
XBPS_BUILDDIR=/builddir
else else
XBPS_DESTDIR=$XBPS_MASTERDIR/destdir XBPS_DESTDIR=$XBPS_MASTERDIR/destdir
XBPS_BUILDDIR=$XBPS_MASTERDIR/builddir
fi fi
if [ -n "$XBPS_HOSTDIR" ]; then if [ -n "$XBPS_HOSTDIR" ]; then
XBPS_PACKAGESDIR=$XBPS_HOSTDIR/binpkgs XBPS_PACKAGESDIR=$XBPS_HOSTDIR/binpkgs
@ -47,7 +49,6 @@ set_defvars()
XBPS_SRCDISTDIR=$XBPS_MASTERDIR/host/sources XBPS_SRCDISTDIR=$XBPS_MASTERDIR/host/sources
XBPS_PACKAGESDIR=$XBPS_MASTERDIR/host/binpkgs XBPS_PACKAGESDIR=$XBPS_MASTERDIR/host/binpkgs
fi fi
XBPS_BUILDDIR=$XBPS_MASTERDIR/builddir
XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files XBPS_TRIGGERSDIR=$XBPS_SRCPKGDIR/xbps-triggers/files
DDIRS="TRIGGERSDIR HELPERSDIR SRCPKGDIR COMMONVARSDIR SHUTILSDIR" DDIRS="TRIGGERSDIR HELPERSDIR SRCPKGDIR COMMONVARSDIR SHUTILSDIR"