Merge branch 'master' of rtime.felk.cvut.cz:frescor/demo

[frescor/demo.git] / build / Makefile.rules

diff --git a/build/Makefile.rules b/build/Makefile.rules
index b4ad98f6c94d94273d7f339782434a90f56c462e..3f1875d9abbd23e0b90af68ae555a129b065c5b0 100644 (file)
--- a/build/Makefile.rules
+++ b/build/Makefile.rules
@@ -155,7 +155,7 @@ endif
 override RELATIVE_DIR := $(RELATIVE_DIR:/%=%)
 override RELATIVE_DIR := $(RELATIVE_DIR:\\%=%)
 #$(warning  RELATIVE_DIR = "$(RELATIVE_DIR)")
-override BACK2TOP_DIR := $(shell echo $(RELATIVE_DIR)/ | sed -e 's_//_/_g' -e 's_/\./_/_g' -e 's_^\./__g'  -e 's_\([^/][^/]*\)_.._g' -e 's_/$$__')
+#override BACK2TOP_DIR := $(shell echo $(RELATIVE_DIR)/ | sed -e 's_//_/_g' -e 's_/\./_/_g' -e 's_^\./__g'  -e 's_\([^/][^/]*\)_.._g' -e 's_/$$__')
 #$(warning  BACK2TOP_DIR = "$(BACK2TOP_DIR)")
 
 #$(warning SOURCES_DIR = "$(SOURCES_DIR)")
@@ -432,7 +432,7 @@ USER_BIN_DIR     := $(OUTPUT_DIR)/$(COMPILED_DIR_NAME)/bin
 USER_BUILD_DIR   := $(OUTPUT_DIR)/$(BUILD_DIR_NAME)/user
 
 ifndef LINUX_VERSION
-LINUX_VERSION=$(shell uname -r)
+export LINUX_VERSION=$(shell uname -r)
 endif
 ifndef LINUX_DIR
 LINUX_DIR=/lib/modules/$(LINUX_VERSION)/build