Fixes left over from one of the previous great directory

re-organizations.  :-)

This commit was SVN r1254.

config/mca_acinclude.m4

@@ -8,23 +8,23 @@ dnl Tests provided by OMPI
 dnl General tests
 dnl
 
-sinclude(../../../../../config/ompi_functions.m4)
-sinclude(../../../../../config/ompi_get_version.m4)
+sinclude(../../../../config/ompi_functions.m4)
+sinclude(../../../../config/ompi_get_version.m4)
 
 dnl
 dnl C compiler tests
 dnl
 
-sinclude(../../../../../config/ompi_setup_cc.m4)
-sinclude(../../../../../config/ompi_check_optflags.m4)
+sinclude(../../../../config/ompi_setup_cc.m4)
+sinclude(../../../../config/ompi_check_optflags.m4)
 
 dnl
 dnl C++ compiler tests
 dnl
 
-sinclude(../../../../../config/ompi_setup_cxx.m4)
-sinclude(../../../../../config/cxx_find_template_repository.m4)
-sinclude(../../../../../config/cxx_find_template_parameters.m4)
+sinclude(../../../../config/ompi_setup_cxx.m4)
+sinclude(../../../../config/cxx_find_template_repository.m4)
+sinclude(../../../../config/cxx_find_template_parameters.m4)
 
 dnl
 dnl This will be replaced with s_i_n_c_l_u_d_e(configure.stub) if it

config/mca_configure.ac

@@ -16,8 +16,8 @@ AC_CONFIG_AUX_DIR(@PARAM_CONFIG_AUX_DIR@)
 
 # Establish the top-level OMPI directory
 
-top_ompi_srcdir='$(top_srcdir)/../../../../..'
-top_ompi_builddir='$(top_builddir)/../../../../..'
+top_ompi_srcdir='$(top_srcdir)/../../../..'
+top_ompi_builddir='$(top_builddir)/../../../..'
 
 AC_SUBST(top_ompi_srcdir)
 AC_SUBST(top_ompi_builddir)
@@ -25,7 +25,7 @@ AC_SUBST(top_ompi_builddir)
 # Get the version of @MCA_TYPE@ @MCA_MODULE_NAME@ that we are installing.
 
 if test -n "@PARAM_VERSION_FILE@" -a -f "@PARAM_VERSION_FILE@"; then
-    OMPI_GET_VERSION($srcdir/../../../../../config, @PARAM_VERSION_FILE@,
+    OMPI_GET_VERSION($srcdir/../../../../config, @PARAM_VERSION_FILE@,
         @PARAM_VAR_PREFIX@)
 
     AC_DEFINE_UNQUOTED(@PARAM_VAR_PREFIX@_MAJOR_VERSION,