[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-backoffice] branch master updated: Care about the --
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-backoffice] branch master updated: Care about the --system pip's flag. |
Date: |
Thu, 28 Mar 2019 19:56:56 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository backoffice.
The following commit(s) were added to refs/heads/master by this push:
new ab5231f Care about the --system pip's flag.
ab5231f is described below
commit ab5231f2f65f2bd4f7e3230eb4b2b8604fca1f21
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Mar 28 19:56:32 2019 +0100
Care about the --system pip's flag.
---
Makefile.in | 4 ++--
configure.ac | 10 ++++++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index e54f1e1..3748959 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -55,9 +55,9 @@ compile-lang:
# install into prefix
.PHONY: install
install: $(templates) install-data compile-lang
- @pip3 install . --install-option="address@hidden@"
+ @pip3 install . @DEBIAN_PIP3_SYSTEM@ --install-option="address@hidden@"
@# force update when sources changed
- @pip3 install . --install-option="address@hidden@" --upgrade --no-deps
+ @pip3 install . @DEBIAN_PIP3_SYSTEM@ --install-option="address@hidden@"
--upgrade --no-deps
cd talerbackoffice/backoffice/static/web-common && make install && cd -
# run testcases
diff --git a/configure.ac b/configure.ac
index 2eee4c7..879c84f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,16 @@ AC_MSG_RESULT([$VERSION])
AX_COMPARE_VERSION([$VERSION],[lt],[6.0], [AC_MSG_ERROR([Please install
pip3>=6.0])])
+# On Debian systems, we may need to pass "--system" to pip3 to get
+# to the desired installation target directory
+pip3 install --help | grep '\-\-system' >> /dev/null
+if test $? -ne 0;
+then
+ DEBIAN_PIP3_SYSTEM=""
+else
+ DEBIAN_PIP3_SYSTEM="--system"
+fi
+AC_SUBST(DEBIAN_PIP3_SYSTEM)
#
# Check for tsc
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-backoffice] branch master updated: Care about the --system pip's flag.,
gnunet <=