summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-12-13 00:39:44 +0100
committerHarald Welte <laforge@gnumonks.org>2017-12-13 00:50:11 +0100
commit9fbe93f5329bbd153a1f7dd3c70e0a54a211feae (patch)
tree45f9aec718ac8b55c5f4e188939c0b37af259b30
parent2a83b0ffcb7621059ef41ae4e048dc76127798ba (diff)
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
-rwxr-xr-xbsc-nat/regen_makefile.sh2
-rwxr-xr-xbsc/regen_makefile.sh2
-rwxr-xr-xggsn_tests/regen_makefile.sh2
-rwxr-xr-xgprs_gb/regen_makefile.sh2
-rwxr-xr-xlapdm/regen_makefile.sh2
-rwxr-xr-xmgw/regen_makefile.sh2
-rwxr-xr-xmsc_tests/regen_makefile.sh2
-rwxr-xr-xsysinfo/regen_makefile.sh2
8 files changed, 8 insertions, 8 deletions
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan/' Makefile
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan `pkg-config --libs libnet
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile
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/LDFLAGS = /LDFLAGS = -L \/usr\/lib\/titan /' Makefile
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