[arch-commits] Commit in git/trunk (PKGBUILD)
Christian Hesse
eworm at archlinux.org
Sun Jun 24 22:33:21 UTC 2018
Date: Sunday, June 24, 2018 @ 22:33:21
Author: eworm
Revision: 327534
start non-standard variables with an underscore
Modified:
git/trunk/PKGBUILD
----------+
PKGBUILD | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-24 21:27:46 UTC (rev 327533)
+++ PKGBUILD 2018-06-24 22:33:21 UTC (rev 327534)
@@ -37,13 +37,13 @@
'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203'
'7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45')
-make_paths=(
+_make_paths=(
prefix='/usr'
gitexecdir='/usr/lib/git-core'
perllibdir="$(/usr/bin/perl -MConfig -wle 'print $Config{installvendorlib}')"
)
-make_options=(
+_make_options=(
CFLAGS="$CFLAGS"
LDFLAGS="$LDFLAGS"
USE_LIBPCRE2=1
@@ -57,15 +57,15 @@
cd "$srcdir/$pkgname-$pkgver"
make \
- "${make_paths[@]}" \
- "${make_options[@]}" \
+ "${_make_paths[@]}" \
+ "${_make_options[@]}" \
all doc
make -C contrib/credential/gnome-keyring
make -C contrib/credential/libsecret
- make -C contrib/subtree "${make_paths[@]}" all doc
- make -C contrib/mw-to-git "${make_paths[@]}" all
- make -C contrib/diff-highlight "${make_paths[@]}"
+ make -C contrib/subtree "${_make_paths[@]}" all doc
+ make -C contrib/mw-to-git "${_make_paths[@]}" all
+ make -C contrib/diff-highlight "${_make_paths[@]}"
}
check() {
@@ -80,8 +80,8 @@
# build chroot (i.e.: /usr/bin/nologin)
SHELL=/bin/sh \
make \
- "${make_paths[@]}" \
- "${make_options[@]}" \
+ "${_make_paths[@]}" \
+ "${_make_options[@]}" \
NO_SVN_TESTS=y \
DEFAULT_TEST_TARGET=prove \
GIT_PROVE_OPTS="$jobs -Q" \
@@ -94,8 +94,8 @@
cd "$srcdir/$pkgname-$pkgver"
make \
- "${make_paths[@]}" \
- "${make_options[@]}" \
+ "${_make_paths[@]}" \
+ "${_make_options[@]}" \
DESTDIR="$pkgdir" \
install install-doc
@@ -114,9 +114,9 @@
"$pkgdir"/usr/lib/git-core/git-credential-libsecret
make -C contrib/credential/libsecret clean
# subtree installation
- make -C contrib/subtree "${make_paths[@]}" DESTDIR="$pkgdir" install install-doc
+ make -C contrib/subtree "${_make_paths[@]}" DESTDIR="$pkgdir" install install-doc
# mediawiki installation
- make -C contrib/mw-to-git "${make_paths[@]}" DESTDIR="$pkgdir" install
+ make -C contrib/mw-to-git "${_make_paths[@]}" DESTDIR="$pkgdir" install
# the rest of the contrib stuff
find contrib/ -name '.gitignore' -delete
cp -a ./contrib/* $pkgdir/usr/share/git/
More information about the arch-commits
mailing list