gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-donations] branch master updated: fix pip3


From: gnunet
Subject: [GNUnet-SVN] [taler-donations] branch master updated: fix pip3
Date: Wed, 27 Mar 2019 18:47:25 +0100

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository donations.

The following commit(s) were added to refs/heads/master by this push:
     new aa6229d  fix pip3
aa6229d is described below

commit aa6229dd85dfe0684dbfbbcde7e3148af8f2f7d8
Author: Marcello Stanisci <address@hidden>
AuthorDate: Wed Mar 27 18:47:16 2019 +0100

    fix pip3
---
 Makefile.in  |  4 ++--
 configure.ac | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index c7b8750..5cb170b 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 talerdonations/donations/static/web-common && make install && cd -
 
 # run testcases
diff --git a/configure.ac b/configure.ac
index 8852d84..c7440be 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]