summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2019-03-27 18:41:02 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2019-03-27 18:41:02 +0100
commitf40114e5b56522890ffe7d9fab80dfc0fecf2ac2 (patch)
treedb51283e13cc9ebd7850010aedb9358074779812
parent49c3ca55986228049dd5f23cca55bccc86b7af15 (diff)
downloadsurvey-f40114e5b56522890ffe7d9fab80dfc0fecf2ac2.tar.gz
survey-f40114e5b56522890ffe7d9fab80dfc0fecf2ac2.tar.bz2
survey-f40114e5b56522890ffe7d9fab80dfc0fecf2ac2.zip
fix pip3 invocation
-rw-r--r--Makefile.in4
-rw-r--r--configure.ac13
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="--prefix=@prefix@"
+ @pip3 install . @DEBIAN_PIP3_SYSTEM@ --install-option="--prefix=@prefix@"
@# force update when sources changed
- @pip3 install . --install-option="--prefix=@prefix@" --upgrade --no-deps
+ @pip3 install . @DEBIAN_PIP3_SYSTEM@ --install-option="--prefix=@prefix@" --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])