summaryrefslogtreecommitdiff
path: root/src/telefire-v0.2
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2014-06-15 17:47:41 -0600
committerBdale Garbee <bdale@gag.com>2014-06-15 17:47:41 -0600
commitc5cfc0d6e507d093987741b6ffaf69ebb24caa4b (patch)
treea75b83343939e96592ac07178f2011d82ea6ded8 /src/telefire-v0.2
parent1b3d07ede530fa40cb7257fb1725c969ba60e0f0 (diff)
parent9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff)
Merge branch 'branch-1.4' into debian
Diffstat (limited to 'src/telefire-v0.2')
-rw-r--r--src/telefire-v0.2/.sdcdbrc2
-rw-r--r--src/telefire-v0.2/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/telefire-v0.2/.sdcdbrc b/src/telefire-v0.2/.sdcdbrc
index b9f6129c..2c77e32b 100644
--- a/src/telefire-v0.2/.sdcdbrc
+++ b/src/telefire-v0.2/.sdcdbrc
@@ -1,2 +1,2 @@
---directory=../cc1111:../product:../core:../drivers:.
+--directory=../cc1111:../product:../kernel:../drivers:.
diff --git a/src/telefire-v0.2/Makefile b/src/telefire-v0.2/Makefile
index a820990a..ad5065c1 100644
--- a/src/telefire-v0.2/Makefile
+++ b/src/telefire-v0.2/Makefile
@@ -5,8 +5,8 @@
TELEFIRE_VER=0.2
TELEFIRE_DEF=0_2
-vpath %.c ..:../core:../cc1111:../drivers:../product
-vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath %.c ..:../kernel:../cc1111:../drivers:../product
+vpath %.h ..:../kernel:../cc1111:../drivers:../product
vpath ao-make-product.5c ../util
ifndef VERSION