Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(188)

Unified Diff: libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh
diff --git a/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh b/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh
index 97e2f9b9064d357941f7ba4e2429b50eba8ab35c..0173ef127916df1e59ef9d44b09f464384ca229f 100755
--- a/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh
+++ b/libraries/OpenSceneGraph-2.9.7/nacl-OpenSceneGraph-2.9.7.sh
@@ -55,19 +55,19 @@ CustomConfigureStep() {
}
CustomInstallStep() {
- Remove ${NACL_SDK_USR_INCLUDE}/osg
- Remove ${NACL_SDK_USR_INCLUDE}/osgUtil
- Remove ${NACL_SDK_USR_INCLUDE}/OpenThreads
+ Remove ${NACLPORTS_INCLUDE}/osg
+ Remove ${NACLPORTS_INCLUDE}/osgUtil
+ Remove ${NACLPORTS_INCLUDE}/OpenThreads
readonly THIS_PACKAGE_PATH=${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
- cp -R include/osg ${NACL_SDK_USR_INCLUDE}/osg
- cp -R include/osgUtil ${NACL_SDK_USR_INCLUDE}/osgUtil
- cp -R include/OpenThreads ${NACL_SDK_USR_INCLUDE}/OpenThreads
- Remove ${NACL_SDK_USR_LIB}/libosg.a
- Remove ${NACL_SDK_USR_LIB}/libosgUtil.a
- Remove ${NACL_SDK_USR_LIB}/libOpenThreads.a
- install -m 644 ${LIB_OSG} ${NACL_SDK_USR_LIB}/${LIB_OSG}
- install -m 644 ${LIB_OSGUTIL} ${NACL_SDK_USR_LIB}/${LIB_OSGUTIL}
- install -m 644 ${LIB_OPENTHREADS} ${NACL_SDK_USR_LIB}/${LIB_OPENTHREADS}
+ cp -R include/osg ${NACLPORTS_INCLUDE}/osg
+ cp -R include/osgUtil ${NACLPORTS_INCLUDE}/osgUtil
+ cp -R include/OpenThreads ${NACLPORTS_INCLUDE}/OpenThreads
+ Remove ${NACLPORTS_LIBDIR}/libosg.a
+ Remove ${NACLPORTS_LIBDIR}/libosgUtil.a
+ Remove ${NACLPORTS_LIBDIR}/libOpenThreads.a
+ install -m 644 ${LIB_OSG} ${NACLPORTS_LIBDIR}/${LIB_OSG}
+ install -m 644 ${LIB_OSGUTIL} ${NACLPORTS_LIBDIR}/${LIB_OSGUTIL}
+ install -m 644 ${LIB_OPENTHREADS} ${NACLPORTS_LIBDIR}/${LIB_OPENTHREADS}
DefaultTouchStep
}

Powered by Google App Engine
This is Rietveld 408576698