Allow re-targeting of naclports install

libraries/ImageMagick-6.5.4-10/nacl-ImageMagick-6.5.4-10.sh

Index: libraries/ImageMagick-6.5.4-10/nacl-ImageMagick-6.5.4-10.sh
diff --git a/libraries/ImageMagick-6.5.4-10/nacl-ImageMagick-6.5.4-10.sh b/libraries/ImageMagick-6.5.4-10/nacl-ImageMagick-6.5.4-10.sh
index d8b48e56a954666bb0525e0896e5af68377ef463..00e1919fa48a6bb0d4145e79e289ad3a3cf34fcf 100755
--- a/libraries/ImageMagick-6.5.4-10/nacl-ImageMagick-6.5.4-10.sh
+++ b/libraries/ImageMagick-6.5.4-10/nacl-ImageMagick-6.5.4-10.sh
@@ -20,8 +20,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};
   # Drop /opt/X11/bin (may interfere build on osx).
   export PATH=$(echo $PATH | sed -e 's;/opt/X11/bin;;')
@@ -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-x=no \
     --disable-largefile \
     --without-fftw
@@ -45,8 +45,8 @@ CustomConfigureStep() {
 CustomBuildAndInstallStep() {
   # assumes pwd has makefile
   make clean
-  make CFLAGS='-DSSIZE_MAX="((ssize_t)(~((size_t)0)>>1))"' \
-    install-libLTLIBRARIES install-data-am -j${OS_JOBS}
+  cflags="${NACLPORTS_CFLAGS} -DSSIZE_MAX=\"((ssize_t)(~((size_t)0)>>1))\""
+  make CFLAGS="${cflags}" install-libLTLIBRARIES install-data-am -j${OS_JOBS}
   DefaultTouchStep
 }