From 0d70b813a2008a5074fd27581b46db2a0c743d47 Mon Sep 17 00:00:00 2001
From: thomasl <thomasl@eurecom.fr>
Date: Fri, 12 Dec 2014 09:05:33 +0000
Subject: [PATCH] fix issue of blank char at beginning of string (not clear why
it appeared)
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@6254 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/RRC/LITE/MESSAGES/Makefile.inc | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/openair2/RRC/LITE/MESSAGES/Makefile.inc b/openair2/RRC/LITE/MESSAGES/Makefile.inc
index 5035fe171c..a51f5b8280 100644
--- a/openair2/RRC/LITE/MESSAGES/Makefile.inc
+++ b/openair2/RRC/LITE/MESSAGES/Makefile.inc
@@ -1,10 +1,10 @@
-current_release_asn1_module=$(substr $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-,, $(wildcard $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-*))
+current_release_asn1_module=$(strip $(notdir $(wildcard $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/.lock-*)))
ifdef CBA
CFLAGS += -DRel10
CFLAGS += -DCBA
- ifneq ($(current_release_asn1_module), rel10-cba)
+ ifneq ($(current_release_asn1_module), .lock-rel10-cba)
tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ;\
rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d ;\
cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ;\
@@ -26,7 +26,7 @@ ifdef CBA
else ifdef Rel10
CFLAGS += -DRel10
- ifneq ($(current_release_asn1_module), rel10)
+ ifneq ($(current_release_asn1_module), .lock-rel10)
tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ;\
rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d ;\
cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ;\
@@ -48,7 +48,7 @@ else ifdef Rel10
else # default is rel 8
CFLAGS += -DRel8
- ifneq ($(current_release_asn1_module), rel8)
+ ifneq ($(current_release_asn1_module), .lock-rel8)
tmp3:=$(shell cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES ;\
rm -f ${ASN_MODULE_SOURCES} $(ASN_MODULE_HEADERS) *.o *.d ;\
cd $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/asn1c/ASN1_files/ ;\
@@ -88,4 +88,4 @@ EXTRA_CFLAGS += -I. -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES
ASN1_MODULE_OBJS=${ASN_MODULE_SOURCES:.c=.o}
ASN1_CONVERTER_OBJS=${ASN_CONVERTER_SOURCES:.c=.o}
-ASN1_MSG_OBJS=$(ASN1_MODULE_OBJS) $(ASN1_CONVERTER_OBJS)
\ No newline at end of file
+ASN1_MSG_OBJS=$(ASN1_MODULE_OBJS) $(ASN1_CONVERTER_OBJS)
--
GitLab