adjust for & mv install_prerquisites prerequisites

Author: Damian Rouson

.gitattributes

@@ -10,7 +10,7 @@
 *.md text
 *.txt text
 *.sh text
-install_prerequisites/build text
+prerequisites/build text
 *.cu text
 *.x64 text
 

.travis.yml

@@ -116,7 +116,7 @@ install:
     elif [[ "X$BUILD_TYPE" != "XInstallScript" ]]; then # Ubuntu on Travis-CI, NOT testing install.sh
       if ! ( [[ -x "$HOME/.local/bin/mpif90" ]] && [[ -x "$HOME/.local/bin/mpicc" ]] ); then
         # mpich install not cached
-        # could use install_prerequisites/build instead...
+        # could use prerequisites/build instead...
         wget "${MPICH_URL_HEAD}/${MPICH_URL_TAIL}"
         mv "$MPICH_URL_TAIL" "$MPICH_DIR/.."
         pushd "$MPICH_DIR/.."

CMakeLists.txt

@@ -105,7 +105,7 @@ endif()
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
 
 add_subdirectory(src)
-add_subdirectory(install_prerequisites)
+add_subdirectory(prerequisites)
 
 #-----------------------------------------------------
 # Publicize installed location to other CMake projects

INSTALL.md

@@ -203,7 +203,7 @@ the [Installation Script] section.  Or try building each prerequisite from sourc
 follows:
 
 ```
-cd install_prerequisites
+cd prerequisites
 CC=gcc FC=gfortran CXX=g++ ./build flex
 ./build gcc
 CC=gcc FC=gfortran CXX=g++ ./build mpich
@@ -235,7 +235,7 @@ where the second line builds the flex package that is required for building gcc
 [Issues]: https://github.com/sourceryinstitute/opencoarrays/issues
 [make.inc]: ./src/make.inc
 [opencoarrays]: ./src/extensions/opencoarrays.F90
-[install_prerequisites]: ./install_prerequisites
+[prerequisites]: ./prerequisites
 [MPICH]: http://www.mpich.org
 [MVAPICH]:http://mvapich.cse.ohio-state.edu
 [MacPorts]: http://www.macports.org

install.sh

@@ -91,7 +91,7 @@ if [[ "$directory_exists" == "false" ]]; then
 fi
 
 build_path=$opencoarrays_src_dir/opencoarrays-build
-build_script=$opencoarrays_src_dir/install_prerequisites/build
+build_script=$opencoarrays_src_dir/prerequisites/build
 if [[ ! -x "$build_script" ]]; then
   echo "$this_script: $build_script script does not exist or the user lacks executable permission for it."
   echo "$this_script: Please run this_script in the top-level OpenCoarrays source directory or set the"
@@ -124,7 +124,7 @@ usage()
 }
 
 # Include stack management functions
-. ./install_prerequisites/stack.sh
+. ./prerequisites/stack.sh
 stack_new dependency_pkg
 stack_new dependency_exe
 stack_new dependency_path
@@ -741,7 +741,7 @@ print_header()
   popd > /dev/null
   echo ""
   echo "*** All prerequisites will be downloaded to, built in, and installed in ***"
-  echo "$opencoarrays_src_dir/install_prerequisites"
+  echo "$opencoarrays_src_dir/prerequisites"
   printf "*** OpenCoarrays will be installed "
   if [[ "$install_path" == "$opencoarrays_src_dir/opencoarrays-installation" ]]; then
     printf "in the above location also.        ***\n"
@@ -922,7 +922,7 @@ elif [[ $1 == '-v' || $1 == '-V' || $1 == '--version' ]]; then
   echo ""
 else # Find or install prerequisites and install OpenCoarrays
 
-  cd install_prerequisites &&
+  cd prerequisites &&
   installation_record=install-opencoarrays.log &&
   . set_SUDO.sh &&
   set_SUDO_if_necessary  &&