diff options
| -rw-r--r-- | tools/darwin/depends/.autom4te.cfg | 2 | ||||
| -rwxr-xr-x | tools/darwin/depends/config.site_ios.mk.in | 2 | ||||
| -rw-r--r-- | tools/darwin/depends/config.site_osx.in | 2 | ||||
| -rw-r--r-- | tools/darwin/depends/config.site_osx.mk.in | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/darwin/depends/.autom4te.cfg b/tools/darwin/depends/.autom4te.cfg index 1739545a6d..8f415d6072 100644 --- a/tools/darwin/depends/.autom4te.cfg +++ b/tools/darwin/depends/.autom4te.cfg @@ -1,3 +1,3 @@ begin-language: "Autoconf" - args: --no-cache +args: --no-cache end-language: "Autoconf" diff --git a/tools/darwin/depends/config.site_ios.mk.in b/tools/darwin/depends/config.site_ios.mk.in index 6fac9490b9..9bf485ac9b 100755 --- a/tools/darwin/depends/config.site_ios.mk.in +++ b/tools/darwin/depends/config.site_ios.mk.in @@ -38,6 +38,6 @@ export ACLOCAL=aclocal -I ${PREFIX}/share/aclocal -I @use_toolchain@share/acloca #export ACLOCAL=aclocal -I ${PREFIX}/share/aclocal -I /Developer/usr/share/aclocal export LIBTOOL=/Developer/usr/bin/glibtool export LIBTOOLIZE=/Developer/usr/bin/glibtoolize -export PKG_CONFIG_PATH=${PREFIX}/usr/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig +export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig export PATH:=@use_toolchain@/bin:${PREFIX}/bin:${platform_path}/usr/bin:/Developer/usr/bin:${PATH} diff --git a/tools/darwin/depends/config.site_osx.in b/tools/darwin/depends/config.site_osx.in index ccbb64a060..6516b42700 100644 --- a/tools/darwin/depends/config.site_osx.in +++ b/tools/darwin/depends/config.site_osx.in @@ -34,7 +34,7 @@ export RANLIB=${platform_path}/usr/bin/ranlib export ACLOCAL="aclocal -I ${prefix}/share/aclocal -I @use_toolchain@/share/aclocal -I ${platform_path}/usr/share/aclocal" export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize -export PKG_CONFIG_PATH=${prefix}/usr/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig +export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig export PATH="@use_toolchain@/bin:${prefix}/bin:${platform_path}/usr/bin:/Developer/usr/bin:${PATH}" export MACOSX_DEPLOYMENT_TARGET=@use_sdk@ diff --git a/tools/darwin/depends/config.site_osx.mk.in b/tools/darwin/depends/config.site_osx.mk.in index 7b71d797c1..84303eebc7 100644 --- a/tools/darwin/depends/config.site_osx.mk.in +++ b/tools/darwin/depends/config.site_osx.mk.in @@ -32,10 +32,10 @@ export AR=${platform_path}/usr/bin/ar export AS=${platform_path}/usr/bin/as export STRIP=${platform_path}/usr/bin/strip export RANLIB=${platform_path}/usr/bin/ranlib -export ACLOCAL=aclocal -I ${PREFIX}/share/aclocal -I @use_toolchain@share/aclocal -I ${platform_path}/usr/share/aclocal +export ACLOCAL=aclocal -I ${PREFIX}/share/aclocal -I @use_toolchain@/share/aclocal -I ${platform_path}/usr/share/aclocal export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize -export PKG_CONFIG_PATH=${PREFIX}/usr/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig +export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig export PATH:=@use_toolchain@/bin:${PREFIX}/bin:${platform_path}/usr/bin:/Developer/usr/bin:${PATH} export MACOSX_DEPLOYMENT_TARGET=@use_sdk@ |