summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2019-03-28 19:56:32 +0100
committerMarcello Stanisci <stanisci.m@gmail.com>2019-03-28 19:56:32 +0100
commitab5231f2f65f2bd4f7e3230eb4b2b8604fca1f21 (patch)
tree46e9fad5a1a3b1faa39607614e185e986538ba26
parent317d1e52fef0bf2002c8488f22cbf8aa7cfcf8e1 (diff)
downloadbackoffice-stable.tar.gz
backoffice-stable.tar.bz2
backoffice-stable.zip
Care about the --system pip's flag.v0.5.2stable
-rw-r--r--Makefile.in4
-rw-r--r--configure.ac10
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="--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 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