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

Unified Diff: libraries/fontconfig-2.7.3/nacl-fontconfig-2.7.3.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/flac-1.2.1/nacl-flac-1.2.1.sh ('k') | libraries/freetype-2.1.10/nacl-freetype-2.1.10.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libraries/fontconfig-2.7.3/nacl-fontconfig-2.7.3.sh
diff --git a/libraries/fontconfig-2.7.3/nacl-fontconfig-2.7.3.sh b/libraries/fontconfig-2.7.3/nacl-fontconfig-2.7.3.sh
index 2795a3a2a7c7a39c835424b6233bdd4bde81abd4..7aea14da0cad00eba075189e9f36eb9560c7eff6 100755
--- a/libraries/fontconfig-2.7.3/nacl-fontconfig-2.7.3.sh
+++ b/libraries/fontconfig-2.7.3/nacl-fontconfig-2.7.3.sh
@@ -39,9 +39,9 @@ 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 PATH=${NACL_BIN_PATH}:${NACL_SDK_USR}/bin:${PATH};
+ export PKG_CONFIG_PATH=${NACLPORTS_LIBDIR}/pkgconfig
+ export PKG_CONFIG_LIBDIR=${NACLPORTS_LIBDIR}
+ export PATH=${NACL_BIN_PATH}:${NACLPORTS_PREFIX}/bin:${PATH};
ChangeDir ${NACL_PACKAGES_REPOSITORY}/${PACKAGE_NAME}
chmod a+x install-sh
cd ${PACKAGE_NAME}-build
@@ -51,10 +51,10 @@ CustomConfigureStep() {
--host=nacl \
--disable-shared \
--disable-docs \
- --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/flac-1.2.1/nacl-flac-1.2.1.sh ('k') | libraries/freetype-2.1.10/nacl-freetype-2.1.10.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698