Bring over Brian's installdirs fixes from this afternoon (r14445).

This commit was SVN r14450.

The following SVN revision numbers were found above:
  r14445 --> open-mpi/ompi@13d366b827

config/ompi_install_dirs.m4

@@ -10,6 +10,8 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
+#                         reserved. 
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -27,20 +29,27 @@
 AC_DEFUN([OMPI_INSTALL_DIRS], [
     ompi_exec_prefix_save="$exec_prefix"
     ompi_prefix_save="$prefix"
-    ompi_datarootdir_save="$datarootdir"
+
+    m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.60]), -1,
+          [ # Previous to 2.60, everything was definied in terms
+            # of datadir instead of datarootdir, so set datarootdir to
+            # datadir in that situation....
+           ompi_datadir_save="$datadir"
+           datarootdir="${datadir}"
+           datadir='${datarootdir}'])
 
     # need to temporarily expand this out as almost exactly as it will
     # be done later so that NONE doesn't show up in the
     # {exec_}prefix-based variables.
     test "x$prefix" = xNONE && prefix=$ac_default_prefix
     test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-    eval datarootdir="$datarootdir"
 
     OPAL_PREFIX="$prefix"
     OPAL_EXEC_PREFIX="$exec_prefix"
     OPAL_BINDIR="$bindir"
     OPAL_SBINDIR="$sbindir"
     OPAL_LIBEXECDIR="$libexecdir"
+    OPAL_DATAROOTDIR="$datarootdir"
     OPAL_DATADIR="$datadir"
     OPAL_SYSCONFDIR="$sysconfdir"
     OPAL_SHAREDSTATEDIR="$sharedstatedir"
@@ -55,6 +64,7 @@ AC_DEFUN([OMPI_INSTALL_DIRS], [
     AC_SUBST(OPAL_BINDIR)
     AC_SUBST(OPAL_SBINDIR)
     AC_SUBST(OPAL_LIBEXECDIR)
+    AC_SUBST(OPAL_DATAROOTDIR)
     AC_SUBST(OPAL_DATADIR)
     AC_SUBST(OPAL_SYSCONFDIR)
     AC_SUBST(OPAL_SHAREDSTATEDIR)
@@ -66,7 +76,8 @@ AC_DEFUN([OMPI_INSTALL_DIRS], [
 
     prefix="$ompi_prefix_save"
     exec_prefix="$ompi_exec_prefix_save"
-    datarootdir="$ompi_datarootdir_save"
+    m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.60]), -1,
+          [datadir="$ompi_datadir_save"])
 
     AC_CONFIG_FILES([$1])
 ])dnl

ompi/tools/wrappers/mpic++-wrapper-data.txt.in

@@ -18,5 +18,5 @@ compiler_flags=@OMPI_WRAPPER_EXTRA_CXXFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 libs=@OMPI_WRAPPER_CXX_LIB@ -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_CXX_REQUIRED_FILE@
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}

ompi/tools/wrappers/mpicc-wrapper-data.txt.in

@@ -18,5 +18,5 @@ compiler_flags=@OMPI_WRAPPER_EXTRA_CFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 libs=-lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}

ompi/tools/wrappers/mpif77-wrapper-data.txt.in

@@ -18,5 +18,5 @@ compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 libs=-lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_F77_REQUIRED_FILE@
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}

ompi/tools/wrappers/mpif90-wrapper-data.txt.in

@@ -19,5 +19,5 @@ compiler_flags=@OMPI_WRAPPER_EXTRA_FFLAGS@
 linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
 libs=-lmpi_f90 -lmpi_f77 -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 required_file=@OMPI_WRAPPER_F90_REQUIRED_FILE@
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}

opal/mca/installdirs/base/installdirs_base_components.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -62,6 +62,8 @@ opal_installdirs_base_open(void)
                          sbindir);
         CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data,
                          libexecdir);
+        CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data,
+                         datarootdir);
         CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data,
                          datadir);
         CONDITIONAL_COPY(opal_install_dirs, component->install_dirs_data, 
@@ -97,6 +99,8 @@ opal_installdirs_base_open(void)
         opal_install_dirs_expand(opal_install_dirs.sbindir);
     opal_install_dirs.libexecdir = 
         opal_install_dirs_expand(opal_install_dirs.libexecdir);
+    opal_install_dirs.datarootdir = 
+        opal_install_dirs_expand(opal_install_dirs.datarootdir);
     opal_install_dirs.datadir = 
         opal_install_dirs_expand(opal_install_dirs.datadir);
     opal_install_dirs.sysconfdir = 
@@ -120,6 +124,26 @@ opal_installdirs_base_open(void)
     opal_install_dirs.pkgincludedir = 
         opal_install_dirs_expand(opal_install_dirs.pkgincludedir);
 
+#if 0
+    fprintf(stderr, "prefix:         %s\n", opal_install_dirs.prefix);
+    fprintf(stderr, "exec_prefix:    %s\n", opal_install_dirs.exec_prefix);
+    fprintf(stderr, "bindir:         %s\n", opal_install_dirs.bindir);
+    fprintf(stderr, "sbindir:        %s\n", opal_install_dirs.sbindir);
+    fprintf(stderr, "libexecdir:     %s\n", opal_install_dirs.libexecdir);
+    fprintf(stderr, "datarootdir:    %s\n", opal_install_dirs.datarootdir);
+    fprintf(stderr, "datadir:        %s\n", opal_install_dirs.datadir);
+    fprintf(stderr, "sysconfdir:     %s\n", opal_install_dirs.sysconfdir);
+    fprintf(stderr, "sharedstatedir: %s\n", opal_install_dirs.sharedstatedir);
+    fprintf(stderr, "localstatedir:  %s\n", opal_install_dirs.localstatedir);
+    fprintf(stderr, "libdir:         %s\n", opal_install_dirs.libdir);
+    fprintf(stderr, "includedir:     %s\n", opal_install_dirs.includedir);
+    fprintf(stderr, "infodir:        %s\n", opal_install_dirs.infodir);
+    fprintf(stderr, "mandir:         %s\n", opal_install_dirs.mandir);
+    fprintf(stderr, "pkgdatadir:     %s\n", opal_install_dirs.pkgdatadir);
+    fprintf(stderr, "pkglibdir:      %s\n", opal_install_dirs.pkglibdir);
+    fprintf(stderr, "pkgincludedir:  %s\n", opal_install_dirs.pkgincludedir);
+#endif
+
     for (i = 0 ; mca_installdirs_base_static_components[i] != NULL ; ++i) {
         if (NULL !=  mca_installdirs_base_static_components[i]->mca_close_component) {
             mca_installdirs_base_static_components[i]->mca_close_component();
@@ -140,6 +164,7 @@ opal_installdirs_base_close(void)
     free(opal_install_dirs.bindir);
     free(opal_install_dirs.sbindir);
     free(opal_install_dirs.libexecdir);
+    free(opal_install_dirs.datarootdir);
     free(opal_install_dirs.datadir);
     free(opal_install_dirs.sysconfdir);
     free(opal_install_dirs.sharedstatedir);

opal/mca/installdirs/base/installdirs_base_expand.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -69,6 +69,7 @@ opal_install_dirs_expand(const char* input)
             EXPAND_STRING(bindir);
             EXPAND_STRING(sbindir);
             EXPAND_STRING(libexecdir);
+            EXPAND_STRING(datarootdir);
             EXPAND_STRING(datadir);
             EXPAND_STRING(sysconfdir);
             EXPAND_STRING(sharedstatedir);

opal/mca/installdirs/config/install_dirs.h.in

@@ -9,6 +9,8 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2007      Los Alamos National Security, LLC.
+ *                         All rights reserved. 
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -26,6 +28,9 @@
  * description of each directory can be found at the following URL:
  *
  * http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+ *
+ * The line below is to shut AC 2.60 up about datarootdir.  Don't remove.
+ * datarootdir=foo
  */
 
 #ifndef OPAL_INST_DIRS_H
@@ -53,6 +58,14 @@
    $(libexecdir)/package-name/machine/version. */
 #define OPAL_LIBEXECDIR "@OPAL_LIBEXECDIR@"
 
+/* The root of the directory tree for read-only
+   architecture-independent data files.
+
+   See not about OPAL_DATADIR.  And you probably want that one, not
+   this one.  This is one of those "building block" paths, that is
+   really only used for defining other paths. */
+#define OPAL_DATAROOTDIR "@OPAL_DATAROOTDIR@"
+
 /* The directory for installing idiosyncratic read-only
   architecture-independent data files for this program. 
 
@@ -63,7 +76,7 @@
 
 /* $(datadir)/package-name/.  You probably want to use this instead of
    OPAL_DATADIR */
-#define OPAL_PKGDATADIR "@OPAL_DATADIR@/@PACKAGE@"
+#define OPAL_PKGDATADIR "${datadir}/@PACKAGE@"
 
 /* The directory for installing read-only data files that pertain to a
    single machine–that is to say, files for configuring a host. Mailer
@@ -96,14 +109,14 @@
 #define OPAL_LIBDIR "@OPAL_LIBDIR@"
 
 /* $(libdir)/package-name/.  This is where components should go */
-#define OPAL_PKGLIBDIR "@OPAL_LIBDIR@/@PACKAGE@"
+#define OPAL_PKGLIBDIR "${libdir}/@PACKAGE@"
 
 /* The directory for installing header files to be included by user
    programs with the C ‘#include’ preprocessor directive. */
 #define OPAL_INCLUDEDIR "@OPAL_INCLUDEDIR@"
 
 /* $(includedir)/package-name/.  The devel headers go in here */
-#define OPAL_PKGINCLUDEDIR "@OPAL_INCLUDEDIR@/@PACKAGE@"
+#define OPAL_PKGINCLUDEDIR "${includedir}/@PACKAGE@"
 
 /* The directory for installing the Info files for this package. */
 #define OPAL_INFODIR "@OPAL_INFODIR@"

opal/mca/installdirs/config/opal_installdirs_config.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * $COPYRIGHT$
  * 
@@ -44,6 +44,7 @@ const opal_installdirs_base_component_t mca_installdirs_config_component = {
         OPAL_BINDIR,
         OPAL_SBINDIR,
         OPAL_LIBEXECDIR,
+        OPAL_DATAROOTDIR,
         OPAL_DATADIR,
         OPAL_SYSCONFDIR,
         OPAL_SHAREDSTATEDIR,

opal/mca/installdirs/env/opal_installdirs_env.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
@@ -64,6 +64,7 @@ installdirs_env_open(void)
     SET_FIELD(bindir, "OPAL_BINDIR");
     SET_FIELD(sbindir, "OPAL_SBINDIR");
     SET_FIELD(libexecdir, "OPAL_LIBEXECDIR");
+    SET_FIELD(datarootdir, "OPAL_DATAROOTDIR");
     SET_FIELD(datadir, "OPAL_DATADIR");
     SET_FIELD(sysconfdir, "OPAL_SYSCONFDIR");
     SET_FIELD(sharedstatedir, "OPAL_SHAREDSTATEDIR");

opal/mca/installdirs/installdirs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006      Los Alamos National Security, LLC.  All rights
+ * Copyright (c) 2006-2007 Los Alamos National Security, LLC.  All rights
  *                         reserved. 
  * $COPYRIGHT$
  * 
@@ -26,6 +26,7 @@ struct opal_install_dirs_t {
     char* bindir;
     char* sbindir;
     char* libexecdir;
+    char* datarootdir;
     char* datadir;
     char* sysconfdir;
     char* sharedstatedir;

opal/tools/wrappers/opalc++-wrapper-data.txt.in

@@ -18,5 +18,5 @@ compiler_flags=@OPAL_WRAPPER_EXTRA_CXXFLAGS@
 linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@
 libs=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@
 required_file=
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}

opal/tools/wrappers/opalcc-wrapper-data.txt.in

@@ -18,5 +18,5 @@ compiler_flags=@OPAL_WRAPPER_EXTRA_CFLAGS@
 linker_flags=@OPAL_WRAPPER_EXTRA_LDFLAGS@
 libs=-lopen-pal @OPAL_WRAPPER_EXTRA_LIBS@
 required_file=
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}

orte/tools/wrappers/ortec++-wrapper-data.txt.in

@@ -18,5 +18,5 @@ compiler_flags=@ORTE_WRAPPER_EXTRA_CXXFLAGS@
 linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@
 libs=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@
 required_file=
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}

orte/tools/wrappers/ortecc-wrapper-data.txt.in

@@ -18,5 +18,5 @@ compiler_flags=@ORTE_WRAPPER_EXTRA_CFLAGS@
 linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@
 libs=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@
 required_file=
-includedir=@OPAL_INCLUDEDIR@
+includedir=${includedir}
-libdir=@OPAL_LIBDIR@
+libdir=${libdir}