From 27e456413c38f828493581d322f2a3fdc6b7ca07 Mon Sep 17 00:00:00 2001 From: ppisa Date: Mon, 7 Jul 2008 09:55:55 +0000 Subject: [PATCH] Corrected seeking for MAKERULES_DIR in leaf-node Makefile redirector. The operator "==" is not defined for some non-bash species of shells, the use of "=" operator corrects the problem. --- lincan/Makefile | 4 ++-- lincan/src/Makefile | 4 ++-- lincan/utils/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lincan/Makefile b/lincan/Makefile index f595272..b22a357 100644 --- a/lincan/Makefile +++ b/lincan/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 +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/lincan/src/Makefile b/lincan/src/Makefile index f595272..b22a357 100644 --- a/lincan/src/Makefile +++ b/lincan/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 +else include $(MAKERULES_DIR)/Makefile.rules endif diff --git a/lincan/utils/Makefile b/lincan/utils/Makefile index f595272..b22a357 100644 --- a/lincan/utils/Makefile +++ b/lincan/utils/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 +else include $(MAKERULES_DIR)/Makefile.rules endif -- 2.39.2