Skip to content

Commit b45d819

Browse files
committed
---
yaml --- r: 1815 b: refs/heads/master c: 9d92543 h: refs/heads/master i: 1813: 32d8cf7 1811: e073f2d 1807: 1a9a431 v: v3
1 parent c75db2b commit b45d819

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: a978d534258241332a186b78df0db9ebffc4b1ee
2+
refs/heads/master: 9d925436f32065f4a1940a9728e4b6f9c8e22c08

trunk/configure

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
#!/bin/sh
22

3-
CFG_SRC_DIR=${0%${0##*/}}
4-
CFG_BUILD_DIR=$PWD
5-
63
msg() {
74
echo "configure: $1"
85
}
@@ -78,6 +75,26 @@ need_cmd grep
7875
need_cmd xargs
7976
need_cmd cp
8077
need_cmd find
78+
need_cmd uname
79+
need_cmd date
80+
81+
msg "inspecting environment"
82+
83+
CFG_OSTYPE=$(uname -s)
84+
CFG_CPUTYPE=$(uname -m)
85+
86+
case $CFG_OSTYPE in
87+
88+
MINGW*)
89+
CFG_SRC_DIR=CFG_SRC_DIR=${0%${0##*\\}}
90+
CFG_BUILD_DIR=$PWD
91+
;;
92+
93+
*)
94+
CFG_SRC_DIR=CFG_SRC_DIR=${0%${0##*/}}
95+
CFG_BUILD_DIR=$PWD
96+
;;
97+
esac
8198

8299
msg "recreating config.mk"
83100
echo '' >config.mk
@@ -95,11 +112,6 @@ do
95112
make_dir $i
96113
done
97114

98-
msg "inspecting environment"
99-
100-
CFG_OSTYPE=$(uname -s)
101-
CFG_CPUTYPE=$(uname -m)
102-
103115
putvar CFG_SRC_DIR
104116
putvar CFG_BUILD_DIR
105117
putvar CFG_OSTYPE

0 commit comments

Comments
 (0)