[MERGED] osmo-ttcn3-hacks[master]: regen-makefile.sh: Support Archlinux install paths

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
Mon Jan 29 21:33:29 UTC 2018


Harald Welte has submitted this change and it was merged.

Change subject: regen-makefile.sh: Support Archlinux install paths
......................................................................


regen-makefile.sh: Support Archlinux install paths

Archlinux (titan-git AUR package) installs everything (includes, libs
and bin) into /usr/ttcn/ prefix.

Change-Id: I545f2f04890310e98233b04b44c4614df34f2f17
---
M regen-makefile.sh
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/regen-makefile.sh b/regen-makefile.sh
index f757fa3..e89b3ee 100755
--- a/regen-makefile.sh
+++ b/regen-makefile.sh
@@ -20,5 +20,9 @@
 sed -i -e 's/CPPFLAGS = -D$(PLATFORM) -I$(TTCN3_DIR)\/include/CPPFLAGS = -D$(PLATFORM) -DMAKEDEPEND_RUN -I$(TTCN3_DIR)\/include -I\/usr\/include\/titan/' Makefile
 
 # for TITAN 6.3.0
-sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
+if cat /etc/issue | grep "Arch Linux" >/dev/null 2>&1; then
+        sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr\/ttcn3/' Makefile
+else
+        sed -i -e 's/TTCN3_DIR = $/TTCN3_DIR = \/usr/' Makefile
+fi
 sed -i -e 's/\/bin\/compiler/\/bin\/ttcn3_compiler/' Makefile

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I545f2f04890310e98233b04b44c4614df34f2f17
Gerrit-PatchSet: 1
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list