[MERGED] osmo-ttcn3-hacks[master]: regen_makefile.sh: Fix TITAN 6.1.0 support

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Tue Dec 12 23:51:24 UTC 2017


Harald Welte has submitted this change and it was merged.

Change subject: regen_makefile.sh: Fix TITAN 6.1.0 support
......................................................................


regen_makefile.sh: Fix TITAN 6.1.0 support

When introducing the rewriting for 6.3.0 we broke the 6.1.0 support.
Now the result should build on Debian with both 6.1.0 and 6.3.0

Change-Id: I263a6abd2d9eb15ce5778ef8dbfcdac2a228b77d
---
M bsc-nat/regen_makefile.sh
M bsc/regen_makefile.sh
M ggsn_tests/regen_makefile.sh
M gprs_gb/regen_makefile.sh
M lapdm/regen_makefile.sh
M mgw/regen_makefile.sh
M msc_tests/regen_makefile.sh
M sysinfo/regen_makefile.sh
8 files changed, 8 insertions(+), 8 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh
index 6fb3ca4..6d0ac12 100755
--- a/bsc-nat/regen_makefile.sh
+++ b/bsc-nat/regen_makefile.sh
@@ -11,5 +11,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile
diff --git a/bsc/regen_makefile.sh b/bsc/regen_makefile.sh
index f037230..4e334d5 100755
--- a/bsc/regen_makefile.sh
+++ b/bsc/regen_makefile.sh
@@ -11,5 +11,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile
diff --git a/ggsn_tests/regen_makefile.sh b/ggsn_tests/regen_makefile.sh
index b3e6332..cd2d95a 100755
--- a/ggsn_tests/regen_makefile.sh
+++ b/ggsn_tests/regen_makefile.sh
@@ -9,5 +9,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile
diff --git a/gprs_gb/regen_makefile.sh b/gprs_gb/regen_makefile.sh
index b45e5b4..72fc632 100755
--- a/gprs_gb/regen_makefile.sh
+++ b/gprs_gb/regen_makefile.sh
@@ -9,5 +9,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile
diff --git a/lapdm/regen_makefile.sh b/lapdm/regen_makefile.sh
index f2d1782..c80b094 100755
--- a/lapdm/regen_makefile.sh
+++ b/lapdm/regen_makefile.sh
@@ -9,5 +9,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile
diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh
index df7ccc7..30f8c33 100755
--- a/mgw/regen_makefile.sh
+++ b/mgw/regen_makefile.sh
@@ -9,5 +9,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile
diff --git a/msc_tests/regen_makefile.sh b/msc_tests/regen_makefile.sh
index 0b4ab88..7db539d 100755
--- a/msc_tests/regen_makefile.sh
+++ b/msc_tests/regen_makefile.sh
@@ -9,5 +9,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile
diff --git a/sysinfo/regen_makefile.sh b/sysinfo/regen_makefile.sh
index 1042090..e06b8f5 100755
--- a/sysinfo/regen_makefile.sh
+++ b/sysinfo/regen_makefile.sh
@@ -9,5 +9,5 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile
+sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile

-- 
To view, visit https://gerrit.osmocom.org/5303
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I263a6abd2d9eb15ce5778ef8dbfcdac2a228b77d
Gerrit-PatchSet: 6
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list