From ba148191914cf3131dc36667c9b04d396afdda0d Mon Sep 17 00:00:00 2001 From: Yves Date: Sat, 17 Jan 2015 14:03:22 +0000 Subject: [PATCH] Use future-proof lib path in build-osx-libs.sh. Patch by trompetin17. There are symbolic links to the library binaries in the directory dist/lib. It's better to use these links rather than the location they point to for the copy command (they point to a different location in ESR31). Refs #2462 This was SVN commit r16153. --- libraries/osx/build-osx-libs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/osx/build-osx-libs.sh b/libraries/osx/build-osx-libs.sh index cc6e4e3ac7..6ea2784735 100755 --- a/libraries/osx/build-osx-libs.sh +++ b/libraries/osx/build-osx-libs.sh @@ -701,7 +701,7 @@ then # js-config.h is different for debug and release builds, so we need different include directories for both mkdir -p $INCLUDE_DIR_DEBUG cp -R -L dist/include/* $INCLUDE_DIR_DEBUG/ - cp *.a $INSTALL_DIR/lib + cp dist/lib/*.a $INSTALL_DIR/lib popd mv Makefile.in.bak Makefile.in mv shell/Makefile.in.bak shell/Makefile.in @@ -714,7 +714,7 @@ then # js-config.h is different for debug and release builds, so we need different include directories for both mkdir -p $INCLUDE_DIR_RELEASE cp -R -L dist/include/* $INCLUDE_DIR_RELEASE/ - cp *.a $INSTALL_DIR/lib + cp dist/lib/*.a $INSTALL_DIR/lib popd mv Makefile.in.bak Makefile.in mv shell/Makefile.in.bak shell/Makefile.in