Merge pull request #8185 from jsquyres/pr/fix-getdate-woes

jsquyres · web-flow · commit 3ea0658f4d25 · 2020-11-05T15:10:03.000-05:00
config/Makefile.am: ensure getdate.sh is in dist tarball
diff --git a/3rd-party/openpmix b/3rd-party/openpmix
@@ -1 +1 @@
-Subproject commit c4fe45f982b6cdf818f9d42d2bdf3a92019f92e4
+Subproject commit 9da252a5ecb5fddb45f93a5169e6e4ef3b7280ec
diff --git a/3rd-party/prrte b/3rd-party/prrte
@@ -1 +1 @@
-Subproject commit 8cc88dd7f7627c2238b9b7bac2e68fe5a6092f7e
+Subproject commit ffdf6916eb600d0b5e37ef6747c5384944db8625
diff --git a/config/Makefile.am b/config/Makefile.am
@@ -29,6 +29,7 @@ EXTRA_DIST = \
         ltmain_pgi_tp.diff \
         opal_mca_priority_sort.pl \
         find_common_syms \
+        getdate.sh \
         make_manpage.pl \
         md2nroff.pl
 
diff --git a/config/opal_functions.m4 b/config/opal_functions.m4
@@ -96,6 +96,12 @@ EOF
 
 OPAL_CONFIGURE_USER="${USER:-`whoami`}"
 OPAL_CONFIGURE_HOST="${HOSTNAME:-`(hostname || uname -n) 2> /dev/null | sed 1q`}"
+# Note: it's ok to use $srcdir here because this macro is called at
+# the very beginning of configure.ac:
+#
+# a) before $OMPI_TOP_SRCDIR is set, and
+# b) from the top-level build directory (i.e., so $srcdir actually
+#    points to the top source directory)
 OPAL_CONFIGURE_DATE="`$srcdir/config/getdate.sh`"
 
 OPAL_LIBNL_SANITY_INIT
