diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2011-11-23 18:41:20 +0000 |
|---|---|---|
| committer | Ariel Constenla-Haile <arielch@apache.org> | 2011-11-23 18:41:20 +0000 |
| commit | 70010c2d7c6472ae40fb0a8fd97e9da159a220b8 (patch) | |
| tree | c49ea0214763bede2c2788ae774a254276d91b59 /bootstrap.1 | |
| parent | d2fc8958fc36b749f5833be4980ab47ccaf587c3 (diff) | |
i118604 - Fixed use of user supplied or system dmake executable
Original committer: Andre Fischer
Diffstat (limited to 'bootstrap.1')
| -rw-r--r-- | bootstrap.1 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/bootstrap.1 b/bootstrap.1 index fb065db43bba..ec6cb0193c4c 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -116,6 +116,20 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then # Clean up. Note that this is skipped when one of the exits is executed above. rm -rf "$tmp_build_dir" +elif test "$IS_SYSTEM_DMAKE" = "YES"; then + + echo "" + echo "dmake is located in search path" + echo "" + +elif test -n "$DMAKE_PATH" -a -x "$DMAKE_PATH" -a ! -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then + + cp -f "$DMAKE_PATH" "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT" || exit + + echo "" + echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT" + echo "" + else if test -x "$SOLARENV/$OUTPATH/bin/dmake$EXEEXT"; then |