newapkbuild: rename _builddir to builddir
the _builddir should never been used bu abuild due to the _ prefix.
This commit is contained in:
parent
a1d23dc995
commit
270e5337e7
@ -197,15 +197,15 @@ source="$source"
|
|||||||
__EOF__
|
__EOF__
|
||||||
|
|
||||||
abuild -f fetch unpack
|
abuild -f fetch unpack
|
||||||
# Figure out the _builddir
|
# Figure out the builddir
|
||||||
for i in src/*; do
|
for i in src/*; do
|
||||||
if [ -d "$i" ]; then
|
if [ -d "$i" ]; then
|
||||||
sdir=$i
|
sdir=$i
|
||||||
_builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g")
|
builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g")
|
||||||
_builddir="\"\$srcdir\"/$_builddir"
|
builddir="\"\$srcdir\"/$_builddir"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
echo "_builddir=$_builddir" >> APKBUILD
|
echo "builddir=$builddir" >> APKBUILD
|
||||||
|
|
||||||
# Check if its autotools
|
# Check if its autotools
|
||||||
if [ -z "$buildtype" ]; then
|
if [ -z "$buildtype" ]; then
|
||||||
@ -227,7 +227,7 @@ __EOF__
|
|||||||
# Create build() function
|
# Create build() function
|
||||||
cat >>APKBUILD<<__EOF__
|
cat >>APKBUILD<<__EOF__
|
||||||
build() {
|
build() {
|
||||||
cd "\$_builddir"
|
cd "\$builddir"
|
||||||
__EOF__
|
__EOF__
|
||||||
|
|
||||||
case "$buildtype" in
|
case "$buildtype" in
|
||||||
@ -251,7 +251,7 @@ __EOF__
|
|||||||
# Create package() function
|
# Create package() function
|
||||||
cat >>APKBUILD<<__EOF__
|
cat >>APKBUILD<<__EOF__
|
||||||
package() {
|
package() {
|
||||||
cd "\$_builddir"
|
cd "\$builddir"
|
||||||
__EOF__
|
__EOF__
|
||||||
|
|
||||||
case "$buildtype" in
|
case "$buildtype" in
|
||||||
|
Loading…
x
Reference in New Issue
Block a user