diff options
| author | S. Davilla <davilla@4pi.com> | 2011-06-12 21:33:32 -0400 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2011-06-12 21:38:36 -0400 |
| commit | 873405b71dbad9d650d71c2701fe0981986ae09e (patch) | |
| tree | 989d37f597bff65d1e2020a12686ab8e956b96b8 | |
| parent | 891a07c14324b2872c489e707cc0c1a2a81092e9 (diff) | |
[osx/ios] fixed darwin depends, /usr/share/aclocal does not exist, use /Developer/usr/share/aclocal instead
| -rwxr-xr-x | tools/darwin/depends/config.site_ios.in | 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 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/darwin/depends/config.site_ios.in b/tools/darwin/depends/config.site_ios.in index e0c2134c2e..230948474a 100755 --- a/tools/darwin/depends/config.site_ios.in +++ b/tools/darwin/depends/config.site_ios.in @@ -24,7 +24,7 @@ export AS="@use_toolchain@/bin/gas-preprocessor.pl ${CC}" export CCAS="--tag CC @use_toolchain@/bin/gas-preprocessor.pl ${CC}" 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 /Developer/usr/share/aclocal" export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig diff --git a/tools/darwin/depends/config.site_ios.mk.in b/tools/darwin/depends/config.site_ios.mk.in index 280946d9a3..edd39533d7 100755 --- a/tools/darwin/depends/config.site_ios.mk.in +++ b/tools/darwin/depends/config.site_ios.mk.in @@ -24,7 +24,7 @@ export AS=@use_toolchain@/bin/gas-preprocessor.pl ${CC} export CCAS=--tag CC @use_toolchain@/bin/gas-preprocessor.pl ${CC} 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 /Developer/usr/share/aclocal export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig diff --git a/tools/darwin/depends/config.site_osx.in b/tools/darwin/depends/config.site_osx.in index fa7358dfe2..86d8390d82 100644 --- a/tools/darwin/depends/config.site_osx.in +++ b/tools/darwin/depends/config.site_osx.in @@ -33,7 +33,7 @@ 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 /Developer/usr/share/aclocal" export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize export PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig diff --git a/tools/darwin/depends/config.site_osx.mk.in b/tools/darwin/depends/config.site_osx.mk.in index ef6f79a41b..7c6f7cda16 100644 --- a/tools/darwin/depends/config.site_osx.mk.in +++ b/tools/darwin/depends/config.site_osx.mk.in @@ -32,7 +32,7 @@ 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 /Developer/usr/share/aclocal export LIBTOOL=@use_toolchain@/bin/glibtool export LIBTOOLIZE=@use_toolchain@/bin/glibtoolize export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${platform_sdk_path}/usr/lib/pkgconfig |