From: Michal Sojka Date: Sun, 28 Nov 2010 18:19:50 +0000 (+0100) Subject: Update OMK leaf Makefile X-Git-Url: https://rtime.felk.cvut.cz/gitweb/canping.git/commitdiff_plain/0973b3949810436f26a663f747e8a3c22a844d72 Update OMK leaf Makefile --- diff --git a/Makefile b/Makefile index f595272..76b56fd 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: - @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else + @echo -e "\nThe Makefile.rules has not been found in this or parent directory\n" +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/src/Makefile b/src/Makefile index f595272..76b56fd 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,14 +1,14 @@ # Generic directory or leaf node makefile for OCERA make framework ifndef MAKERULES_DIR -MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" == `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) +MAKERULES_DIR := $(shell ( old_pwd="" ; while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd` ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) ) endif ifeq ($(MAKERULES_DIR),) all : default .DEFAULT:: - @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n" -else + @echo -e "\nThe Makefile.rules has not been found in this or parent directory\n" +else include $(MAKERULES_DIR)/Makefile.rules endif