[arch-commits] Commit in git/trunk (PKGBUILD)

[Christian Hesse]

    Date: Tuesday, April 3, 2018 @ 09:23:27
  Author: eworm
Revision: 320893

split off configured paths

Modified:
  git/trunk/PKGBUILD

----------+
 PKGBUILD |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-03 08:32:02 UTC (rev 320892)
+++ PKGBUILD	2018-04-03 09:23:27 UTC (rev 320893)
@@ -37,10 +37,13 @@
             'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203'
             '7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45')
 
+make_paths=(
+  prefix='/usr'
+  gitexecdir='/usr/lib/git-core'
+  perllibdir="$(/usr/bin/perl -MConfig -wle 'print $Config{installvendorlib}')"
+)
+
 make_options=(
-  prefix=/usr
-  gitexecdir=/usr/lib/git-core
-  perllibdir=$(/usr/bin/perl -MConfig -wle 'print $Config{installvendorlib}')
   CFLAGS="$CFLAGS"
   LDFLAGS="$LDFLAGS"
   USE_LIBPCRE2=1
@@ -54,15 +57,16 @@
   cd "$srcdir/$pkgname-$pkgver"
 
   make \
+    "${make_paths[@]}" \
     "${make_options[@]}" \
     all doc
 
-  make -C contrib/emacs prefix=/usr
+  make -C contrib/emacs "${make_paths[@]}"
   make -C contrib/credential/gnome-keyring
   make -C contrib/credential/libsecret
-  make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core all doc
-  make -C contrib/mw-to-git prefix=/usr all
-  make -C contrib/diff-highlight prefix=/usr
+  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() {
@@ -77,6 +81,7 @@
   # build chroot (i.e.: /usr/bin/nologin)
   SHELL=/bin/sh \
   make \
+    "${make_paths[@]}" \
     "${make_options[@]}" \
     NO_SVN_TESTS=y \
     DEFAULT_TEST_TARGET=prove \
@@ -90,6 +95,7 @@
   cd "$srcdir/$pkgname-$pkgver"
   
   make \
+    "${make_paths[@]}" \
     "${make_options[@]}" \
     DESTDIR="$pkgdir" \
     install install-doc
@@ -101,7 +107,7 @@
   mkdir -p "$pkgdir"/usr/share/git/
   install -m 0644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
   # emacs
-  make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install
+  make -C contrib/emacs "${make_paths[@]}" DESTDIR="$pkgdir" install
   # gnome credentials helper
   install -m 0755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
       "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring
@@ -111,9 +117,9 @@
       "$pkgdir"/usr/lib/git-core/git-credential-libsecret
   make -C contrib/credential/libsecret clean
   # subtree installation
-  make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install install-doc
+  make -C contrib/subtree "${make_paths[@]}" DESTDIR="$pkgdir" install install-doc
   # mediawiki installation
-  make -C contrib/mw-to-git prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install
+  make -C contrib/mw-to-git "${make_paths[@]}" DESTDIR="$pkgdir" install
   mv "$pkgdir"/Git/Mediawiki.pm "$pkgdir"/usr/share/perl5/vendor_perl/Git/ && rmdir "$pkgdir"/Git # TODO: fix install path!
   # the rest of the contrib stuff
   find contrib/ -name '.gitignore' -delete