Meta/Make: teach --dash option
Junio C Hamano committed
Jul 19, 2013 at 12:41 UTC
4978109241a45392e1b89925341dae3ef0cd92eb
1 file changed
+20
-10
Make
+20
-10
@@ -57,7 +57,7 @@ do
57
done
58
59
Wall="-Wall -Wdeclaration-after-statement -Wno-format-zero-length${Wall+ $Wall}"
60
-tests= jobs= skip= oldtest=
60
+tests= jobs= skip= oldtest= with_dash=
61
62
case `uname` in
63
OpenBSD)
@@ -145,6 +145,9 @@ do
145
done | tr '\012' ' '
146
)
147
;;
148
+ --dash)
149
+ with_dash=y
150
+ ;;
151
--)
152
shift
153
break
@@ -160,6 +163,8 @@ do
163
shift
164
done
165
166
+test -f /bin/dash || with_dash=
167
+
168
if test -z "$tests" && test -n "$skip"
169
then
170
GIT_SKIP_TESTS="${GIT_SKIP_TESTS:-$skip}"
@@ -189,16 +194,21 @@ snap)
194
*)
195
prefix="$inst_prefix/git-test" ;;
196
esac
192
-d="prefix=$prefix"
197
198
determine_long_version >version
199
196
-d="$d "'
197
-MAN_BASE_URL="http://www.kernel.org/pub/software/scm/git/docs/"
198
-ASCIIDOC_NO_ROFF=YesPlease
199
-ASCIIDOC8=YesPlease
200
-BLK_SHA1=YesPlease
201
-GNU_ROFF=YesPlease'
200
+set "prefix=$prefix" "$@"
201
+if test -n "$with_dash" && test -f /bin/dash
202
+then
203
+ set "SHELL_PATH=/bin/dash" "$@"
204
+fi
205
+
206
+set MAN_BASE_URL='"http://www.kernel.org/pub/software/scm/git/docs/"' \
207
+ ASCIIDOC_NO_ROFF=YesPlease \
208
+ ASCIIDOC8=YesPlease \
209
+ BLK_SHA1=YesPlease \
210
+ GNU_ROFF=YesPlease \
211
+ "$@"
212
213
# Platform hack
214
if test -z "${make:+set}" && {
@@ -221,11 +231,11 @@ then
231
unset OK_TO_USE_CFLAGS
232
fi
233
224
-${make-make} $d \
234
+${make-make} \
235
+ $jobs \
236
ETC_GITCONFIG=$prefix/etc/gitconfig \
237
${OK_TO_USE_CFLAGS+"CFLAGS=$CFLAGS"} \
238
${tests:+"T=$tests"} \
228
- $jobs \
239
"$@"
240
status=$?
241
rm -f version