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

Unified Diff: libraries/ffmpeg-0.5/nacl-ffmpeg-0.5.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/ffmpeg-0.5/nacl-ffmpeg-0.5.sh
diff --git a/libraries/ffmpeg-0.5/nacl-ffmpeg-0.5.sh b/libraries/ffmpeg-0.5/nacl-ffmpeg-0.5.sh
index e1e30bc013c2fcf57366d21c5115ee1424de5b2e..2033dd29603a498244988d96ab6c6941316d15d2 100755
--- a/libraries/ffmpeg-0.5/nacl-ffmpeg-0.5.sh
+++ b/libraries/ffmpeg-0.5/nacl-ffmpeg-0.5.sh
@@ -19,8 +19,8 @@ source ../../build_tools/common.sh
CustomConfigureStep() {
- export PKG_CONFIG_PATH=${NACL_SDK_USR_LIB}/pkgconfig
- export PKG_CONFIG_LIBDIR=${NACL_SDK_USR_LIB}
+ export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
+ export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
export PATH=${NACL_BIN_PATH}:${PATH};
MakeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}/${PACKAGE_NAME}-build
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}/${PACKAGE_NAME}-build
@@ -52,8 +52,8 @@ CustomConfigureStep() {
--disable-ffserver \
--disable-demuxer=rtsp \
--disable-demuxer=image2 \
- --prefix=${NACL_SDK_USR} \
- --libdir=${NACL_SDK_USR_LIB}
+ --prefix=${NACLPORTS_PREFIX} \
+ --libdir=${NACLPORTS_LIBDIR}
}

Powered by Google App Engine
This is Rietveld 408576698