Makefiles: Fix paths

diff --git a/aircon/firmware/Makefile b/aircon/firmware/Makefile
index 1b9f247c502fa44af672fc4e69d681c5f4fafb2b..f22a1e7244c7c52aaef7482060b84169b7397cdc 100644 (file)
--- a/aircon/firmware/Makefile
+++ b/aircon/firmware/Makefile
@@ -1,5 +1,5 @@
-ROOT=..
-BINARY=main
+ROOT=../..
+BINARY=aircon
 OBJS=main.o
 LIB_OBJS=util-debug.o ds18b20.o modbus.o
 

diff --git a/mk/bluepill.mk b/mk/bluepill.mk
index 0ceab7de95b12144572407879ce7e2c9a419e42c..d6146abd72cfbeb495c1999dcfa7f4cf815d722b 100644 (file)
--- a/mk/bluepill.mk
+++ b/mk/bluepill.mk
@@ -63,7 +63,7 @@ TGT_CFLAGS    += $(ARCH_FLAGS)
 TGT_CFLAGS     += -Wall -Wextra -Wshadow -Wimplicit-function-declaration
 TGT_CFLAGS     += -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes -Wno-parentheses
 TGT_CFLAGS     += -fno-common -ffunction-sections -fdata-sections
-TGT_CFLAGS     += -I. -I../lib
+TGT_CFLAGS     += -I. -I$(ROOT)/lib
 
 TGT_CPPFLAGS   += -MD