Changed the export commands so that, if there's anything in CPLUS_INCLUDE_PATH and LIBRARY_PATH already, those paths will be added to instead of just overwritten.