From 91814e52ae6d0866a67f8e2dd8baec4402f160eb Mon Sep 17 00:00:00 2001
From: Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
Date: Tue, 1 Apr 2014 16:37:07 +0200
Subject: [PATCH] make: replace MAKEBASE with RIOTBASE

closes https://github.com/RIOT-OS/RIOT/issues/959
---
 Makefile.modules                   | 1 -
 cpu/arm_common/Makefile.include    | 2 +-
 cpu/cc430/Makefile.include         | 2 +-
 cpu/lpc1768/Makefile.include       | 2 +-
 cpu/lpc2387/gpioint/Makefile       | 2 +-
 cpu/lpc2387/i2c/Makefile           | 2 +-
 cpu/lpc2387/mci/Makefile           | 2 +-
 cpu/lpc2387/rtc/Makefile           | 2 +-
 cpu/mc1322x/Makefile.include       | 2 +-
 cpu/mc1322x/adc/Makefile           | 2 +-
 cpu/mc1322x/asm/Makefile           | 2 +-
 cpu/mc1322x/maca/Makefile          | 2 +-
 cpu/msp430-common/Makefile.include | 2 +-
 cpu/native/net/Makefile            | 2 +-
 cpu/native/rtc/Makefile            | 2 +-
 drivers/cc110x/Makefile            | 2 +-
 drivers/cc110x_ng/spi/Makefile     | 2 +-
 drivers/lm75a/Makefile             | 2 +-
 drivers/ltc4150/Makefile           | 2 +-
 drivers/sht11/Makefile             | 2 +-
 drivers/srf02/Makefile             | 2 +-
 drivers/srf08/Makefile             | 2 +-
 sys/transceiver/Makefile           | 2 +-
 sys/uart0/Makefile                 | 2 +-
 24 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/Makefile.modules b/Makefile.modules
index fa32697488..0c378806e7 100644
--- a/Makefile.modules
+++ b/Makefile.modules
@@ -1,4 +1,3 @@
-export MAKEBASE =$(RIOTBASE)
 UNDEF += $(BINDIR)startup.o
 
 include $(RIOTBASE)/Makefile.pseudomodules
diff --git a/cpu/arm_common/Makefile.include b/cpu/arm_common/Makefile.include
index 4ffd7b0de8..2314e46239 100644
--- a/cpu/arm_common/Makefile.include
+++ b/cpu/arm_common/Makefile.include
@@ -1,3 +1,3 @@
-INCLUDES += -I$(MAKEBASE)/cpu/arm_common/include/
+INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include/
 
 export UNDEF += $(BINDIR)syscalls.o
diff --git a/cpu/cc430/Makefile.include b/cpu/cc430/Makefile.include
index ae7de8cc19..cbad776158 100644
--- a/cpu/cc430/Makefile.include
+++ b/cpu/cc430/Makefile.include
@@ -1,3 +1,3 @@
-INCLUDES += -I$(MAKEBASE)/cpu/cc430/include/
+INCLUDES += -I$(RIOTBASE)/cpu/cc430/include/
 
 include $(RIOTCPU)/msp430-common/Makefile.include
diff --git a/cpu/lpc1768/Makefile.include b/cpu/lpc1768/Makefile.include
index bacb82189b..d3ef771ec2 100644
--- a/cpu/lpc1768/Makefile.include
+++ b/cpu/lpc1768/Makefile.include
@@ -1,3 +1,3 @@
-INCLUDES += -I$(MAKEBASE)/cpu/lpc1768/include
+INCLUDES += -I$(RIOTBASE)/cpu/lpc1768/include
 
 export UNDEF += $(BINDIR)syscalls.o
diff --git a/cpu/lpc2387/gpioint/Makefile b/cpu/lpc2387/gpioint/Makefile
index 695bc04395..960dd49c72 100644
--- a/cpu/lpc2387/gpioint/Makefile
+++ b/cpu/lpc2387/gpioint/Makefile
@@ -1,3 +1,3 @@
 MODULE =gpioint
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/lpc2387/i2c/Makefile b/cpu/lpc2387/i2c/Makefile
index e1c5af410e..5a2dc6bbd5 100644
--- a/cpu/lpc2387/i2c/Makefile
+++ b/cpu/lpc2387/i2c/Makefile
@@ -1,3 +1,3 @@
 MODULE =i2c
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/lpc2387/mci/Makefile b/cpu/lpc2387/mci/Makefile
index 970c9d87f5..43164be733 100644
--- a/cpu/lpc2387/mci/Makefile
+++ b/cpu/lpc2387/mci/Makefile
@@ -1,3 +1,3 @@
 MODULE =mci
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/lpc2387/rtc/Makefile b/cpu/lpc2387/rtc/Makefile
index 4d24181c99..042b611808 100644
--- a/cpu/lpc2387/rtc/Makefile
+++ b/cpu/lpc2387/rtc/Makefile
@@ -1,3 +1,3 @@
 MODULE =rtc
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/mc1322x/Makefile.include b/cpu/mc1322x/Makefile.include
index 9bc7621575..20f8afee4b 100644
--- a/cpu/mc1322x/Makefile.include
+++ b/cpu/mc1322x/Makefile.include
@@ -1,4 +1,4 @@
-INCLUDES += -I$(MAKEBASE)/cpu/mc1322x/include
+INCLUDES += -I$(RIOTBASE)/cpu/mc1322x/include
 
 include $(RIOTCPU)/arm_common/Makefile.include
 
diff --git a/cpu/mc1322x/adc/Makefile b/cpu/mc1322x/adc/Makefile
index 4e1bdca68c..a4edfd7d06 100644
--- a/cpu/mc1322x/adc/Makefile
+++ b/cpu/mc1322x/adc/Makefile
@@ -2,4 +2,4 @@ INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/adc/include
 
 MODULE =mc1322x_adc
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/mc1322x/asm/Makefile b/cpu/mc1322x/asm/Makefile
index 6f90f68834..82c3626ff9 100644
--- a/cpu/mc1322x/asm/Makefile
+++ b/cpu/mc1322x/asm/Makefile
@@ -2,4 +2,4 @@ INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/asm/include
 
 MODULE =mc1322x_asm
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/mc1322x/maca/Makefile b/cpu/mc1322x/maca/Makefile
index a6cf750214..373dd437fc 100644
--- a/cpu/mc1322x/maca/Makefile
+++ b/cpu/mc1322x/maca/Makefile
@@ -2,4 +2,4 @@ INCLUDES = -I$(RIOTBASE)/cpu/mc1322x/include -I$(RIOTBASE)/cpu/mc1322x/maca/incl
 
 MODULE =mc1322x
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/cpu/msp430-common/Makefile.include b/cpu/msp430-common/Makefile.include
index e089341767..caa62451a9 100644
--- a/cpu/msp430-common/Makefile.include
+++ b/cpu/msp430-common/Makefile.include
@@ -1 +1 @@
-INCLUDES += -I$(MAKEBASE)/cpu/msp430-common/include/
+INCLUDES += -I$(RIOTBASE)/cpu/msp430-common/include/
diff --git a/cpu/native/net/Makefile b/cpu/native/net/Makefile
index 6f69094f82..0c4702e0a2 100644
--- a/cpu/native/net/Makefile
+++ b/cpu/native/net/Makefile
@@ -1,6 +1,6 @@
 MODULE = nativenet
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
 
 $(BINDIR)%.o: %.c
 	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
diff --git a/cpu/native/rtc/Makefile b/cpu/native/rtc/Makefile
index 13b8ace18b..717274edc2 100644
--- a/cpu/native/rtc/Makefile
+++ b/cpu/native/rtc/Makefile
@@ -1,6 +1,6 @@
 MODULE =rtc
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
 
 $(BINDIR)%.o: %.c
 	$(AD)$(CC) $(CFLAGS) $(NATIVEINCLUDES) -c $*.c -o $(BINDIR)$*.o
diff --git a/drivers/cc110x/Makefile b/drivers/cc110x/Makefile
index da9308bbd5..da43c6b942 100644
--- a/drivers/cc110x/Makefile
+++ b/drivers/cc110x/Makefile
@@ -1,3 +1,3 @@
 MODULE =cc110x
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/drivers/cc110x_ng/spi/Makefile b/drivers/cc110x_ng/spi/Makefile
index d73874dec2..a66970b033 100644
--- a/drivers/cc110x_ng/spi/Makefile
+++ b/drivers/cc110x_ng/spi/Makefile
@@ -2,4 +2,4 @@ MODULE =cc110x_spi
 
 INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/drivers/lm75a/Makefile b/drivers/lm75a/Makefile
index f96cb2a3d6..b1095f7fc0 100644
--- a/drivers/lm75a/Makefile
+++ b/drivers/lm75a/Makefile
@@ -1,2 +1,2 @@
 MODULE =lm75a
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/drivers/ltc4150/Makefile b/drivers/ltc4150/Makefile
index 29b91b361a..42881d6195 100644
--- a/drivers/ltc4150/Makefile
+++ b/drivers/ltc4150/Makefile
@@ -1,2 +1,2 @@
 MODULE =ltc4150
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/drivers/sht11/Makefile b/drivers/sht11/Makefile
index 1f88712aa4..0ccc6b38b2 100644
--- a/drivers/sht11/Makefile
+++ b/drivers/sht11/Makefile
@@ -1,2 +1,2 @@
 MODULE =sht11
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/drivers/srf02/Makefile b/drivers/srf02/Makefile
index 31ac029367..6e23e8fe1a 100644
--- a/drivers/srf02/Makefile
+++ b/drivers/srf02/Makefile
@@ -1,2 +1,2 @@
 MODULE =srf02
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/drivers/srf08/Makefile b/drivers/srf08/Makefile
index 92e6531754..ec63204246 100644
--- a/drivers/srf08/Makefile
+++ b/drivers/srf08/Makefile
@@ -1,2 +1,2 @@
 MODULE =srf08
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile
index 2828e7bb28..6b3ed1b85f 100644
--- a/sys/transceiver/Makefile
+++ b/sys/transceiver/Makefile
@@ -12,4 +12,4 @@ ifneq (,$(filter mc1322x,$(USEMODULE)))
 	INCLUDES += -I$(RIOTBASE)/sys/net/include
 endif
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
diff --git a/sys/uart0/Makefile b/sys/uart0/Makefile
index 04f1ef49f3..64c07fc24f 100644
--- a/sys/uart0/Makefile
+++ b/sys/uart0/Makefile
@@ -1,3 +1,3 @@
 MODULE = uart0
 
-include $(MAKEBASE)/Makefile.base
+include $(RIOTBASE)/Makefile.base
-- 
GitLab