From aa68159ae4d4c09fe635865c7ea9221f2d4c2994 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 5 Jun 2008 15:29:53 +0200
Subject: [PATCH] wmake must be made before other targets.
---
Allwmake | 5 +++--
wmake/wmkdir | 16 ++++++++++------
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/Allwmake b/Allwmake
index a311597d39e..515d1cdf9af 100755
--- a/Allwmake
+++ b/Allwmake
@@ -1,9 +1,10 @@
#!/bin/sh
set -x
-(cd $WM_PROJECT_INST_DIR/ThirdParty && ./Allwmake)
+# wmake is required for subsequent targets
+(cd wmake/src && make)
-(cd wmake && ./makeWmake)
+(cd $WM_PROJECT_INST_DIR/ThirdParty && ./Allwmake)
(cd src && ./Allwmake)
diff --git a/wmake/wmkdir b/wmake/wmkdir
index ef89acc924f..54c85c0aa33 100755
--- a/wmake/wmkdir
+++ b/wmake/wmkdir
@@ -27,17 +27,21 @@
# wmkdir
#
# Description
-# Script which makes a directory is not already constucted.
+# Script that makes a directory is not already constructed.
# Usage : wmkdir <directoryName>
#
#------------------------------------------------------------------------------
-if [ $# = 1 ]
+if [ $# -eq 1 ]
then
- if [ ! -d $1 ]
- then
- mkdir -p $1
- fi
+ # provide help
+ if [ "$1" = "-h" -o "$1" = "-help" ]
+ then
+ echo "usage: ${0##*/} <dir>"
+ echo " mkdir if directory does not already exist"
+ else
+ [ -d "$1" ] || mkdir -p "$1"
+ fi
fi
--
GitLab