From f7d8f1d02199b58adddb96e748b4295e4a0b5d1d Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 4 Mar 2003 10:56:05 +0000
Subject: [PATCH] Remove any '/' chars from the OS name returned by uname.
---
src/sbbs3/GNUmakefile | 2 ++
src/sbbs3/scfg/GNUmakefile | 2 ++
xtrn/sbj/GNUmakefile | 5 ++++-
xtrn/sbl/GNUmakefile | 4 +++-
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/sbbs3/GNUmakefile b/src/sbbs3/GNUmakefile
index 458e1209e9..bc99240f09 100644
--- a/src/sbbs3/GNUmakefile
+++ b/src/sbbs3/GNUmakefile
@@ -57,6 +57,8 @@ endif
# this line wont work with solaris unless awk in path is actually gawk
os := $(shell echo $(os) | tr "[A-Z]" "[a-z]")
#os := $(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
+# remove '/' from "os/2"
+os := $(shell echo $(os) | tr -d "/")
ifeq ($(os),freebsd)
BSD = 1
diff --git a/src/sbbs3/scfg/GNUmakefile b/src/sbbs3/scfg/GNUmakefile
index 566f8c4b25..b2b5e061c1 100644
--- a/src/sbbs3/scfg/GNUmakefile
+++ b/src/sbbs3/scfg/GNUmakefile
@@ -35,6 +35,8 @@ ifndef os
$(warning OS not specified on command line, setting to '$(os)'.)
endif
os := $(shell echo $(os) | tr "[A-Z]" "[a-z]")
+# remove '/' from "os/2"
+os := $(shell echo $(os) | tr -d "/")
ODIR := gcc.$(os)
diff --git a/xtrn/sbj/GNUmakefile b/xtrn/sbj/GNUmakefile
index bb9794380a..ef8cb7980e 100644
--- a/xtrn/sbj/GNUmakefile
+++ b/xtrn/sbj/GNUmakefile
@@ -23,7 +23,10 @@ ifndef os
os = $(shell uname)
$(warning OS not specified on command line, setting to '$(os)'.)
endif
-os := $(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
+os := $(shell echo $(os) | tr "[A-Z]" "[a-z]")
+# remove '/' from "os/2"
+os := $(shell echo $(os) | tr -d "/")
+
LIBDIR := /usr/lib
DELETE := rm -f -v
diff --git a/xtrn/sbl/GNUmakefile b/xtrn/sbl/GNUmakefile
index 6d23c4af1e..fd47105fcf 100644
--- a/xtrn/sbl/GNUmakefile
+++ b/xtrn/sbl/GNUmakefile
@@ -29,7 +29,9 @@ ifndef os
os = $(shell uname)
$(warning OS not specified on command line, setting to '$(os)'.)
endif
-os := $(shell echo $(os) | awk '/.*/ { print tolower($$1)}')
+os := $(shell echo $(os) | tr "[A-Z]" "[a-z]")
+# remove '/' from "os/2"
+os := $(shell echo $(os) | tr -d "/")
LIBDIR := /usr/lib
DELETE := rm -f -v
--
GitLab