From 9fbe93f5329bbd153a1f7dd3c70e0a54a211feae Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 13 Dec 2017 00:39:44 +0100 Subject: 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 --- bsc-nat/regen_makefile.sh | 2 +- bsc/regen_makefile.sh | 2 +- ggsn_tests/regen_makefile.sh | 2 +- gprs_gb/regen_makefile.sh | 2 +- lapdm/regen_makefile.sh | 2 +- mgw/regen_makefile.sh | 2 +- msc_tests/regen_makefile.sh | 2 +- sysinfo/regen_makefile.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bsc-nat/regen_makefile.sh b/bsc-nat/regen_makefile.sh index 6fb3ca4a..6d0ac127 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 f037230e..4e334d5e 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 b3e63322..cd2d95ae 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 b45e5b4b..72fc632b 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 f2d17824..c80b0946 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 df7ccc76..30f8c337 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 0b4ab886..7db539d0 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 1042090c..e06b8f50 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 -- cgit v1.2.3