The final step of the RFC: convert the <foo>libdir and friends to fit their respective code areas, and equate them all at the top. Note that we can't entirely separate things as the opal_install_dirs framework can't handle separated locations for the various trees.

This commit was SVN r31679.

Author: Ralph Castain

Makefile.ompi-rules

@@ -13,20 +13,26 @@
 	@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
 	  -e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
 	  -e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
+	  -e 's/#OPAL_DATE#/@OMPI_RELEASE_DATE@/g' \
+	  -e 's/#ORTE_DATE#/@OMPI_RELEASE_DATE@/g' \
 	  > $@ < $<
 
 .3in.3:
 	@ echo "  SED      $@"
 	@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
 	  -e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
 	  -e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
+	  -e 's/#OPAL_DATE#/@OMPI_RELEASE_DATE@/g' \
+	  -e 's/#ORTE_DATE#/@OMPI_RELEASE_DATE@/g' \
 	  > $@ < $<
 
 .7in.7:
 	@ echo "  SED      $@"
 	@ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
 	  -e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
 	  -e 's/#OMPI_DATE#/@OMPI_RELEASE_DATE@/g' \
+	  -e 's/#OPAL_DATE#/@OMPI_RELEASE_DATE@/g' \
+	  -e 's/#ORTE_DATE#/@OMPI_RELEASE_DATE@/g' \
 	  > $@ < $<
 
 # A little verbosity magic; "make" will show the terse output.  "make

autogen.pl

@@ -259,17 +259,17 @@ sub mca_process_component {
 sub ignored {
     my ($dir) = @_;
 
-    # If this directory does not have .ompi_ignore, or if it has a
-    # .ompi_unignore that has my username in it, then add it to the
+    # If this directory does not have .opal_ignore, or if it has a
+    # .opal_unignore that has my username in it, then add it to the
     # list of components.
     my $ignored = 0;
 
-    if (-f "$dir/.ompi_ignore") {
+    if (-f "$dir/.opal_ignore") {
         $ignored = 1;
     }
-    if (-f "$dir/.ompi_unignore") {
-        open(UNIGNORE, "$dir/.ompi_unignore") ||
-            my_die "Can't open $dir/.ompi_unignore file";
+    if (-f "$dir/.opal_unignore") {
+        open(UNIGNORE, "$dir/.opal_unignore") ||
+            my_die "Can't open $dir/.opal_unignore file";
         my $unignore;
         $unignore .= $_
             while (<UNIGNORE>);
@@ -353,7 +353,7 @@ sub mca_process_framework {
 
                 # Check ignore status
                 if (ignored("$dir/$d")) {
-                    verbose "    => Ignored (found .ompi_ignore file)\n";
+                    verbose "    => Ignored (found .opal_ignore file)\n";
                 } else {
                     mca_process_component($topdir, $project, $framework, $d);
                 }