alex/st
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace deprecated $startdir with $BUILDDIR

Browse Source
This commit is contained in:
Sebastian J. Bronner
2019-10-16 00:07:42 +02:00
parent 2e4363e1dc
commit 0414f6257a
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.SRCINFO
View File

@@ -1,7 +1,7 @@
pkgbase = st pkgbase = st
pkgdesc = A simple virtual terminal emulator for X. pkgdesc = A simple virtual terminal emulator for X.
pkgver = 0.8.2 pkgver = 0.8.2
pkgrel = 4 pkgrel = 5
url = http://st.suckless.org url = http://st.suckless.org
arch = i686 arch = i686
arch = x86_64 arch = x86_64

12
PKGBUILD
View File

@@ -5,7 +5,7 @@
pkgname=st pkgname=st
pkgver=0.8.2 pkgver=0.8.2
pkgrel=4 pkgrel=5
pkgdesc='A simple virtual terminal emulator for X.' pkgdesc='A simple virtual terminal emulator for X.'
arch=('i686' 'x86_64' 'armv7h') arch=('i686' 'x86_64' 'armv7h')
license=('MIT') license=('MIT')
@@ -20,7 +20,7 @@ prepare() {
# This package provides a mechanism to provide a custom config.h. Multiple # This package provides a mechanism to provide a custom config.h. Multiple
# configuration states are determined by the presence of two files in # configuration states are determined by the presence of two files in
# $startdir: # $BUILDDIR:
# #
# * config.h: The user has supplied his or her configuration. The file will # * config.h: The user has supplied his or her configuration. The file will
# be copied to $srcdir and used during build. # be copied to $srcdir and used during build.
@@ -37,10 +37,10 @@ prepare() {
# future runs will proceed with default values due to the presence of # future runs will proceed with default values due to the presence of
# config.def.h. # config.def.h.
abort= abort=
if [ -e "$startdir/config.h" ] if [ -e "$BUILDDIR/config.h" ]
then then
cp "$startdir/config.h" "$pkgname-$pkgver" cp "$BUILDDIR/config.h" "$pkgname-$pkgver"
elif [ ! -e "$startdir/config.def.h" ] elif [ ! -e "$BUILDDIR/config.def.h" ]
then then
abort=1 abort=1
msg='This package can be configured in config.h. Copy provided ' msg='This package can be configured in config.h. Copy provided '
@@ -48,7 +48,7 @@ prepare() {
msg+='config.def.h as it is to use default values. Then rerun makepkg.' msg+='config.def.h as it is to use default values. Then rerun makepkg.'
error "$msg" error "$msg"
fi fi
cp "$pkgname-$pkgver/config.def.h" "$startdir" cp "$pkgname-$pkgver/config.def.h" "$BUILDDIR"
test -z "$abort" test -z "$abort"
} }