changes from master

[blast] / modules / approx.mk

diff --git a/modules/approx.mk b/modules/approx.mk
index 05bda84badab938ea853b98b93fb71e69c260b17..f7541d7d231d3cde159a4882e0101d9a4d4240d8 100644 (file)
--- a/modules/approx.mk
+++ b/modules/approx.mk
@@ -7,10 +7,14 @@ ifndef approxhost
   approxhost := localhost
 endif
 
+approxrepos := main
+approxrepos += $(findstring contrib, ${SOURCES})
+approxrepos += $(findstring non-free, ${SOURCES})
+
 ifdef approx
   BOOTSTRAP := ${approx}
   define SOURCES =
-  deb ${approx} ${release} main
+  deb ${approx} ${release} ${approxrepos}
   endef
 else ifdef raspi
   BOOTSTRAP := http://localhost/raspbian
@@ -23,7 +27,7 @@ else ifdef raspi
 else
   BOOTSTRAP := http://localhost/debian
   define SOURCES :=
-  deb http://${approxhost}/debian ${release} main
+  deb http://${approxhost}/debian ${release} ${approxrepos}
   endef
 endif