[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-survey] branch master updated: fix pip3 invocation
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-survey] branch master updated: fix pip3 invocation |
Date: |
Wed, 27 Mar 2019 18:41:10 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository survey.
The following commit(s) were added to refs/heads/master by this push:
new f40114e fix pip3 invocation
f40114e is described below
commit f40114e5b56522890ffe7d9fab80dfc0fecf2ac2
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Mar 27 18:41:02 2019 +0100
fix pip3 invocation
---
Makefile.in | 4 ++--
configure.ac | 13 +++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 1a7f2b0..8f5ae5b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,9 +40,9 @@ devinstall: $(templates) install-data
# install into prefix
.PHONY: install
install: $(templates) install-data
- @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 talersurvey/survey/static/web-common && make install && cd -
# run testcases
diff --git a/configure.ac b/configure.ac
index 58f5b5e..5e349d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,19 @@ if test $? -ne 0;
AC_MSG_ERROR([Please install pip3>=6.0])
fi
+# 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)
+
+
+
VERSION=$(pip3 --version | $AWK '{ print $2 }')
AC_MSG_RESULT([$VERSION])
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-survey] branch master updated: fix pip3 invocation,
gnunet <=