From 79ea454ec13b24d295d2df75f8939c5775ada6ad Mon Sep 17 00:00:00 2001 From: whitequark Date: Sun, 28 Jan 2018 14:28:55 +0000 Subject: [PATCH] conda: use $SP_DIR instead of $PREFIX/lib/python3.5/site-packages. (#652) This removes the last hardcoded python3.5 reference. --- conda/artiq-kasli-opticlock/build.sh | 2 +- conda/artiq-kc705-nist_clock/build.sh | 2 +- conda/artiq-kc705-nist_qc2/build.sh | 2 +- conda/artiq-sayma-standalone/build.sh | 2 +- conda/artiq-sayma_rtm/build.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conda/artiq-kasli-opticlock/build.sh b/conda/artiq-kasli-opticlock/build.sh index c69d49191..eb20aa328 100644 --- a/conda/artiq-kasli-opticlock/build.sh +++ b/conda/artiq-kasli-opticlock/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kasli-opticlock +SOC_PREFIX=$SP_DIR/artiq/binaries/kasli-opticlock mkdir -p $SOC_PREFIX V=1 $PYTHON -m artiq.gateware.targets.kasli -V opticlock diff --git a/conda/artiq-kc705-nist_clock/build.sh b/conda/artiq-kc705-nist_clock/build.sh index dcad86304..7a7ff66a2 100644 --- a/conda/artiq-kc705-nist_clock/build.sh +++ b/conda/artiq-kc705-nist_clock/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_clock +SOC_PREFIX=$SP_DIR/artiq/binaries/kc705-nist_clock mkdir -p $SOC_PREFIX V=1 $PYTHON -m artiq.gateware.targets.kc705 -V nist_clock diff --git a/conda/artiq-kc705-nist_qc2/build.sh b/conda/artiq-kc705-nist_qc2/build.sh index 4610d14f6..5e8d7cbdc 100644 --- a/conda/artiq-kc705-nist_qc2/build.sh +++ b/conda/artiq-kc705-nist_qc2/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/kc705-nist_qc2 +SOC_PREFIX=$SP_DIR/artiq/binaries/kc705-nist_qc2 mkdir -p $SOC_PREFIX V=1 $PYTHON -m artiq.gateware.targets.kc705 -V nist_qc2 diff --git a/conda/artiq-sayma-standalone/build.sh b/conda/artiq-sayma-standalone/build.sh index 824329f3e..db7a45f7f 100644 --- a/conda/artiq-sayma-standalone/build.sh +++ b/conda/artiq-sayma-standalone/build.sh @@ -2,7 +2,7 @@ RTM_PREFIX=$SP_DIR/artiq/binaries/sayma_rtm -SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/sayma-standalone +SOC_PREFIX=$SP_DIR/artiq/binaries/sayma-standalone mkdir -p $SOC_PREFIX $PYTHON -m artiq.gateware.targets.sayma_amc -V standalone \ diff --git a/conda/artiq-sayma_rtm/build.sh b/conda/artiq-sayma_rtm/build.sh index 282ad44d2..28389ece4 100644 --- a/conda/artiq-sayma_rtm/build.sh +++ b/conda/artiq-sayma_rtm/build.sh @@ -1,6 +1,6 @@ #!/bin/bash -SOC_PREFIX=$PREFIX/lib/python3.5/site-packages/artiq/binaries/sayma_rtm +SOC_PREFIX=$SP_DIR/artiq/binaries/sayma_rtm mkdir -p $SOC_PREFIX $PYTHON -m artiq.gateware.targets.sayma_rtm