summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-05-17 19:14:04 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-05-17 19:14:04 -0400
commitb04dc724f01f47107b31b791950d22c27aca7d9b (patch)
tree94b5946c07eabe56fc25fd249bd42d528ae399c6
parentf112d1655963668d67126cd9becfc1f9b873ecbb (diff)
parenta1594ae1f6cd183efaee5c52eca01fe5d708b1e1 (diff)
downloaddevtools32-b04dc724f01f47107b31b791950d22c27aca7d9b.tar.xz
Merge branch 'archlinux'libretools-20150526
-rw-r--r--Makefile2
-rw-r--r--makechrootpkg.in3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4ebfd1e..646258c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-V=20150228
+V=20150514
PREFIX = /usr/local
diff --git a/makechrootpkg.in b/makechrootpkg.in
index ad5e3d9..8f07dc1 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -157,7 +157,8 @@ prepare_chroot() {
# Read .makepkg.conf and gnupg pubring
if [[ -r $USER_HOME/.gnupg/pubring.kbx ]]; then
install -D "$USER_HOME/.gnupg/pubring.kbx" "$copydir/build/.gnupg/pubring.kbx"
- elif [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then
+ fi
+ if [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then
install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
fi