diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-09-15 10:18:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-09-15 10:18:41 +0000 |
| commit | afb4d6149f98a869914799836247f06af194cf87 (patch) | |
| tree | fd30c9a5e09fa944a02018106a0b41f020461347 | |
| parent | ce12d6eb3a13d01307bef4ef7de928e501f5e152 (diff) | |
INTEGRATION: CWS vq35 (1.17.20); FILE MERGED
2006/08/10 23:15:51 vq 1.17.20.2: #i68509# Use --enable-spawn for when building dmake on cygwin.
2006/08/10 23:08:39 vq 1.17.20.1: #i68312# Build and use guw.exe.
| -rw-r--r-- | config_office/bootstrap.1 | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/config_office/bootstrap.1 b/config_office/bootstrap.1 index a6624c51ab54..da0451a9214b 100644 --- a/config_office/bootstrap.1 +++ b/config_office/bootstrap.1 @@ -1,9 +1,12 @@ # executables are *.exe for WNT. This variable is necessary since Cygwin 1.5.x +# Use spawn instead of fork when building dmake on cygwin. if test "$GUI" = "WNT"; then EXEEXT=".exe" + DMAKE_CONF="--enable-spawn" else EXEEXT="" + DMAKE_CONF="" fi export EXEEXT @@ -30,7 +33,7 @@ if test "$BUILD_DMAKE" != "NO"; then $GNUMAKE distclean || exit fi - ./configure || exit + ./configure $DMAKE_CONF || exit ## invoke the gnu make command set by configure. $GNUMAKE || exit @@ -56,6 +59,18 @@ if test "$BUILD_DMAKE" != "NO"; then echo "dmake copied to $SOLARENV/$OUTPATH/bin/dmake$EXEEXT" fi +if test "$GUI" = "WNT" -a ! -x "$SOLARENV/$OUTPATH/bin/guw$EXEEXT"; then + echo "" + echo "Calling $GNUMAKE in guw" + cd "$SRC_ROOT/config_office/guw" || exit + $GNUMAKE || exit + echo "" + echo "guw has been successfully made" + cp -f "$SRC_ROOT/config_office/guw/guw$EXEEXT" "$SOLARENV/$OUTPATH/bin" || exit + echo "" + echo "guw copied to $SOLARENV/$OUTPATH/bin/guw$EXEEXT" +fi + #make sure build.pl is executable chmod +x "$SRC_ROOT/solenv/bin/build.pl" |