Merge: Corrected seeking for MAKERULES_DIR in leaf-node Makefile redirector.

Merge commit 'remotes/sf-ocera-lincan/master'

diff --git a/lincan/Makefile b/lincan/Makefile
index f595272447ee336c2773b8736d60ee6e88cf5189..b22a35765d37ba44709f41e4182c62dbed0e43b7 100644 (file)
--- 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 f595272447ee336c2773b8736d60ee6e88cf5189..b22a35765d37ba44709f41e4182c62dbed0e43b7 100644 (file)
--- 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 f595272447ee336c2773b8736d60ee6e88cf5189..b22a35765d37ba44709f41e4182c62dbed0e43b7 100644 (file)
--- 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