Author: mseidel
Date: Tue Mar 27 20:24:08 2018
New Revision: 1827868
URL: http://svn.apache.org/viewvc?rev=1827868&view=rev
Log:
Also copy config.sub before building dmake
Modified:
openoffice/trunk/main/bootstrap.1
Modified: openoffice/trunk/main/bootstrap.1
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bootstrap.1?rev=1827868&r1=1827867&r2=1827868&view=diff
==============================================================================
--- openoffice/trunk/main/bootstrap.1 (original)
+++ openoffice/trunk/main/bootstrap.1 Tue Mar 27 20:24:08 2018
@@ -113,7 +113,7 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLAR
echo "can not unpack the dmake source"
dmake_directory_name=
exit 1
- ;;
+ ;;
esac
echo "entering $dmake_directory_name"
@@ -136,14 +136,15 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLAR
$GNUMAKE distclean || exit
fi
- # The config.guess for dmake is too old, overwrite it with ours:
+ # config.guess and config.sub for dmake are too old, overwrite with ours:
cp $SOLARSRC/config.guess .
+ cp $SOLARSRC/config.sub .
# We also need to patch dmake for Win64
patch -p0 < $SOLARSRC/solenv/src/dmake-cygwin64.patch
./configure $DMAKE_CONF || exit
-
+
## invoke the gnu make command set by configure.
$GNUMAKE || exit
@@ -154,7 +155,7 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLAR
echo "dmake successfully built and copied to
$SOLARENV/$INPATH/bin/dmake$EXEEXT"
echo ""
- # Clean up. Note that this is skipped when one of the exits is executed
above.
+ # 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
