From ffb41cc94a19fb7b7811df616074d025d354f74d Mon Sep 17 00:00:00 2001
From: Guilhem Lavaux <lavaux@illinois.edu>
Date: Mon, 5 Nov 2012 16:13:44 -0600
Subject: [PATCH] Enforces /lib/ (anot /lib64/ or something else) for
 dependencies

---
 external/external_build.cmake | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/external/external_build.cmake b/external/external_build.cmake
index 5bc7c2e..555d3dd 100644
--- a/external/external_build.cmake
+++ b/external/external_build.cmake
@@ -87,7 +87,11 @@ if (INTERNAL_HDF5)
   ExternalProject_Add(hdf5
     PREFIX ${BUILD_PREFIX}/hdf5-prefix
     URL ${HDF5_URL}
-    CONFIGURE_COMMAND ${HDF5_SOURCE_DIR}/configure --disable-shared --enable-cxx --with-pic --prefix=${HDF5_BIN_DIR} CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
+    CONFIGURE_COMMAND ${HDF5_SOURCE_DIR}/configure
+           --disable-shared --enable-cxx --with-pic
+	   --prefix=${HDF5_BIN_DIR} --libdir=${HDF5_BIN_DIR}/lib 
+	   CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER} 
+	   CXX=${CMAKE_CXX_COMPILER}
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND make install
   )
@@ -125,7 +129,12 @@ if (INTERNAL_NETCDF)
     DEPENDS ${hdf5_built}
     PREFIX ${BUILD_PREFIX}/netcdf-prefix
     URL ${NETCDF_URL}
-    CONFIGURE_COMMAND ${NETCDF_SOURCE_DIR}/configure --prefix=${NETCDF_BIN_DIR} --enable-netcdf-4  --with-pic --disable-shared --disable-dap --disable-cdmremote --disable-rpc --disable-examples ${EXTRA_NC_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
+    CONFIGURE_COMMAND ${NETCDF_SOURCE_DIR}/configure
+         --prefix=${NETCDF_BIN_DIR} --libdir=${NETCDF_BIN_DIR}/lib
+         --enable-netcdf-4  --with-pic --disable-shared --disable-dap 
+         --disable-cdmremote --disable-rpc 
+         --disable-examples ${EXTRA_NC_FLAGS} CC=${CMAKE_C_COMPILER}
+         CXX=${CMAKE_CXX_COMPILER}
     BUILD_IN_SOURCE 1
     INSTALL_COMMAND make install
   )
@@ -142,7 +151,8 @@ ELSE(INTERNAL_NETCDF)
   find_library(NETCDFCPP_LIBRARY netcdf_c++)
   find_path(NETCDF_INCLUDE_PATH NAMES netcdf.h)
   find_path(NETCDFCPP_INCLUDE_PATH NAMES netcdf)
-  SET(CONFIGURE_CPP_FLAGS ${CONFIGURE_CPP_FLAGS} -I${NETCDF_INCLUDE_PATH} -I${NETCDFCPP_INCLUDE_PATH})
+  SET(CONFIGURE_CPP_FLAGS ${CONFIGURE_CPP_FLAGS} 
+          -I${NETCDF_INCLUDE_PATH} -I${NETCDFCPP_INCLUDE_PATH})
 endif (INTERNAL_NETCDF)
 
 ##################
@@ -154,7 +164,8 @@ if (INTERNAL_BOOST)
   ExternalProject_Add(boost
     URL ${BOOST_URL}
     PREFIX ${BUILD_PREFIX}/boost-prefix
-    CONFIGURE_COMMAND ${BOOST_SOURCE_DIR}/bootstrap.sh --prefix=${CMAKE_BINARY_DIR}/ext_build/boost
+    CONFIGURE_COMMAND 
+           ${BOOST_SOURCE_DIR}/bootstrap.sh --prefix=${CMAKE_BINARY_DIR}/ext_build/boost
     BUILD_IN_SOURCE 1
     BUILD_COMMAND ${BOOST_SOURCE_DIR}/b2 --with-exception --with-python
     INSTALL_COMMAND echo "No install"
@@ -172,7 +183,10 @@ IF(INTERNAL_GSL)
   ExternalProject_Add(gsl
     URL ${GSL_URL}
     PREFIX ${BUILD_PREFIX}/gsl-prefix
-    CONFIGURE_COMMAND ${GSL_SOURCE_DIR}/configure --prefix=${CMAKE_BINARY_DIR}/ext_build/gsl --disable-shared --with-pic CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
+    CONFIGURE_COMMAND ${GSL_SOURCE_DIR}/configure
+           --prefix=${CMAKE_BINARY_DIR}/ext_build/gsl --disable-shared
+           --with-pic --libdir=${CMAKE_BINARY_DIR}/ext_build/gsl/lib
+           CPPFLAGS=${CONFIGURE_CPP_FLAGS} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER}
     BUILD_IN_SOURCE 1
     BUILD_COMMAND make
     INSTALL_COMMAND make install
@@ -220,7 +234,7 @@ ExternalProject_Add(cfitsio
   PREFIX ${BUILD_PREFIX}/cfitsio-prefix
   CONFIGURE_COMMAND 
         ${CMAKE_SOURCE_DIR}/external/cfitsio/configure 
-	    --prefix=${CMAKE_BINARY_DIR}/ext_build/cfitsio 
+	    --prefix=${CMAKE_BINARY_DIR}/ext_build/cfitsio --libdir=${CMAKE_BINARY_DIR}/ext_build/cfitsio/lib
 	    CPPFLAGS=${CONFIGURE_CPP_FLAGS} 
 	    CC=${CMAKE_C_COMPILER} 
 	    CXX=${CMAKE_CXX_COMPILER}