From 81b6fff674e7325d9f336c7b34c0333ef4909da1 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Fri, 17 Jul 2009 15:39:16 +0100
Subject: [PATCH] Changed wmake/utilbin to wmake/bin.

---
 wmake/Makefile          |  2 +-
 wmake/scripts/makeFiles |  6 +++---
 wmake/src/Makefile      | 18 +++++++++---------
 wmake/src/dirToString.c |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/wmake/Makefile b/wmake/Makefile
index 78b442e43d..ae4fd43f13 100644
--- a/wmake/Makefile
+++ b/wmake/Makefile
@@ -106,7 +106,7 @@ SEXE            = a.out
 
 GENERAL_RULES = $(WM_DIR)/rules/General
 RULES         = $(WM_DIR)/rules/$(WM_ARCH)$(WM_COMPILER)
-UTILBIN       = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER)
+BIN           = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
 
 include $(GENERAL_RULES)/general
 include $(RULES)/general
diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles
index 3ccc3fa221..c36f153b3c 100755
--- a/wmake/scripts/makeFiles
+++ b/wmake/scripts/makeFiles
@@ -39,7 +39,7 @@ then
     exit 1
 fi
 
-utilbin=$WM_DIR/utilbin/$WM_ARCH$WM_COMPILER
+bin=$WM_DIR/bin/$WM_ARCH$WM_COMPILER
 
 [ -d Make ] || mkdir Make
 rm -f Make/files
@@ -51,7 +51,7 @@ do
     if [ $dir != . ]
     then
         baseDir=`echo $dir | sed 's%^\./%%'`
-        baseDirName=`echo $baseDir | $utilbin/dirToString`
+        baseDirName=`echo $baseDir | $bin/dirToString`
 
         if [ $baseDirName != Make ]
         then
@@ -66,7 +66,7 @@ files=`find . -name "*.[cCylfF]" -type f  -print`
 
 for file in $files
 do
-    pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $utilbin/dirToString`
+    pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $bin/dirToString`
     fileName=`echo ${file##*/}`
 
     if [ "$pathName" != "" ]
diff --git a/wmake/src/Makefile b/wmake/src/Makefile
index daa1e56c6b..d764aeba88 100644
--- a/wmake/src/Makefile
+++ b/wmake/src/Makefile
@@ -43,22 +43,22 @@ SHELL      = /bin/sh
 .SUFFIXES:
 .SUFFIXES: .o
 
-UTILBIN = $(WM_DIR)/utilbin/$(WM_ARCH)$(WM_COMPILER)
+BIN = $(WM_DIR)/bin/$(WM_ARCH)$(WM_COMPILER)
 
-all:  $(UTILBIN)/dirToString $(UTILBIN)/wmkdep
+all:  $(BIN)/dirToString $(BIN)/wmkdep
 
 clean:
-	rm -f $(UTILBIN)/dirToString $(UTILBIN)/wmkdep 2>/dev/null
+	rm -f $(BIN)/dirToString $(BIN)/wmkdep 2>/dev/null
 
 
-$(UTILBIN)/dirToString: dirToString.c
-	@mkdir -p $(UTILBIN)
-	$(cc) $(cFLAGS) dirToString.c -o $(UTILBIN)/dirToString
+$(BIN)/dirToString: dirToString.c
+	@mkdir -p $(BIN)
+	$(cc) $(cFLAGS) dirToString.c -o $(BIN)/dirToString
 
-$(UTILBIN)/wmkdep: wmkdep.l
-	@mkdir -p $(UTILBIN)
+$(BIN)/wmkdep: wmkdep.l
+	@mkdir -p $(BIN)
 	flex wmkdep.l
-	$(cc) $(cFLAGS) lex.yy.c -o $(UTILBIN)/wmkdep
+	$(cc) $(cFLAGS) lex.yy.c -o $(BIN)/wmkdep
 
 
 #------------------------------------------------------------------------------
diff --git a/wmake/src/dirToString.c b/wmake/src/dirToString.c
index 1116214530..b5fb428b0e 100644
--- a/wmake/src/dirToString.c
+++ b/wmake/src/dirToString.c
@@ -34,10 +34,10 @@ Usage
 
     e.g.
         using sh
-        baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString`
+        baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString`
 
         using csh
-        set baseDirName=`echo $dir | sed 's%^\./%%' | $utilbin/dirToString`
+        set baseDirName=`echo $dir | sed 's%^\./%%' | $bin/dirToString`
 
 \*----------------------------------------------------------------------------*/