diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-20 17:43:06 +0200 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2010-09-20 17:43:06 +0200 |
| commit | 500b9d2ad05a2005be6a80ea86c61e4149dc4d6d (patch) | |
| tree | de6d03cd8f536f4c1e576d97145009eef07fa637 /distro-configs | |
| parent | a701f20fbab525a772be91273d8d581d8fdc8ed8 (diff) | |
Upgrade the "internal" ant to 1.8.1 and clean up the configury
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/CommonWin32.conf.in | 2 | ||||
| -rw-r--r-- | distro-configs/GoOoLinux.conf.in | 2 | ||||
| -rw-r--r-- | distro-configs/Raw.conf.in | 2 | ||||
| -rw-r--r-- | distro-configs/Solaris.conf.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/distro-configs/CommonWin32.conf.in b/distro-configs/CommonWin32.conf.in index e36fb061b..546cb33b0 100644 --- a/distro-configs/CommonWin32.conf.in +++ b/distro-configs/CommonWin32.conf.in @@ -1,2 +1,2 @@ ---with-ant-home=$BUILDDIR/apache-ant-1.7.0 +--with-ant-home=$BUILDDIR/$APACHE_ANT --with-build-version=\"ooo-build `date +%Y-%m-%d`\" diff --git a/distro-configs/GoOoLinux.conf.in b/distro-configs/GoOoLinux.conf.in index f7d7bd2d6..473f1ab05 100644 --- a/distro-configs/GoOoLinux.conf.in +++ b/distro-configs/GoOoLinux.conf.in @@ -46,7 +46,7 @@ --enable-report-builder --with-extension-integration --with-linker-hash-style=both ---with-ant-home=$BUILDDIR/apache-ant-1.7.0 +--with-ant-home=$BUILDDIR/$APACHE_ANT --with-system-dicts --with-external-dict-dir=/usr/share/hunspell --with-external-hyph-dir=/usr/share/hyphen diff --git a/distro-configs/Raw.conf.in b/distro-configs/Raw.conf.in index d8ed64aef..72cd097b9 100644 --- a/distro-configs/Raw.conf.in +++ b/distro-configs/Raw.conf.in @@ -1,3 +1,3 @@ --with-vendor=\"Go-oo Project\" --with-java-target-version=1.5 ---with-ant-home=$BUILDDIR/apache-ant-1.7.0 +--with-ant-home=$BUILDDIR/$APACHE_ANT diff --git a/distro-configs/Solaris.conf.in b/distro-configs/Solaris.conf.in index 8437568c7..dc198e710 100644 --- a/distro-configs/Solaris.conf.in +++ b/distro-configs/Solaris.conf.in @@ -33,7 +33,7 @@ --without-system-icu --without-nas --disable-kde ---with-ant-home=/opt/apache-ant-1.7.0/ +--with-ant-home=$BUILDDIR/$APACHE_ANT --with-jdk-home=/usr/jdk/jdk1.5.0_12 --disable-scsolver --without-unix-wrapper |