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

Unified Diff: libraries/pixman-0.16.2/nacl-pixman-0.16.2.sh

Issue 11885025: Allow re-targeting of naclports install (Closed) Base URL: http://naclports.googlecode.com/svn/trunk/src
Patch Set: rebase 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
« no previous file with comments | « libraries/pango-1.29.3/nacl-pango-1.29.3.sh ('k') | libraries/tinyxml/nacl-tinyxml.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/pixman-0.16.2/nacl-pixman-0.16.2.sh
diff --git a/libraries/pixman-0.16.2/nacl-pixman-0.16.2.sh b/libraries/pixman-0.16.2/nacl-pixman-0.16.2.sh
index 15755f94e815886f31c9c70e051b977026e8aa8d..79955bc2c98874e6ea46b6b9933768335a37ec02 100755
--- a/libraries/pixman-0.16.2/nacl-pixman-0.16.2.sh
+++ b/libraries/pixman-0.16.2/nacl-pixman-0.16.2.sh
@@ -21,8 +21,8 @@ CustomConfigureStep() {
export CXX=${NACLCXX}
export AR=${NACLAR}
export RANLIB=${NACLRANLIB}
- 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};
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
Remove ${PACKAGE_NAME}-build
@@ -32,10 +32,10 @@ CustomConfigureStep() {
../configure \
--host=nacl \
--disable-shared \
- --prefix=${NACL_SDK_USR} \
- --exec-prefix=${NACL_SDK_USR} \
- --libdir=${NACL_SDK_USR_LIB} \
- --oldincludedir=${NACL_SDK_USR_INCLUDE} \
+ --prefix=${NACLPORTS_PREFIX} \
+ --exec-prefix=${NACLPORTS_PREFIX} \
+ --libdir=${NACLPORTS_LIBDIR} \
+ --oldincludedir=${NACLPORTS_INCLUDE} \
--with-http=off \
--with-html=off \
--with-ftp=off \
« no previous file with comments | « libraries/pango-1.29.3/nacl-pango-1.29.3.sh ('k') | libraries/tinyxml/nacl-tinyxml.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698