docs: fix OpenSHMEM man pages in dist

Ensure to always include the non-generated man pages (i.e., the pages
that are simply nroff redirects to Sphinx-generated man pages).

Signed-off-by: Jeff Squyres <[email protected]>

Author: jsquyres

docs/Makefile.am

@@ -785,6 +785,40 @@ OSHMEM_MAN1_BUILT = $(OSHMEM_MAN1:%.1=$(MAN_OUTDIR)/%.1)
 OSHMEM_MAN3_RST = $(OSHMEM_MAN3:%.3=man-oshmem/man3/%.3.rst)
 OSHMEM_MAN3_BUILT = $(OSHMEM_MAN3:%.3=$(MAN_OUTDIR)/%.3)
 
+EXTRA_DIST += \
+        $(OMPI_MAN1_BUILT) \
+        $(OMPI_MAN3_BUILT) \
+        $(OMPI_MAN5_BUILT) \
+        $(OSHMEM_MAN1_BUILT) \
+        $(OSHMEM_MAN3_BUILT)
+
+###########################################################################
+
+# These files are not generated by Sphinx (they are redirects to
+# Sphinx-generated man pages).
+OMPI_MAN1_REDIRECTS = \
+        man-openmpi/man1/mpicc.1 \
+        man-openmpi/man1/mpicxx.1 \
+        man-openmpi/man1/mpic++.1 \
+        man-openmpi/man1/mpifort.1 \
+        man-openmpi/man1/mpif77.1 \
+        man-openmpi/man1/mpif90.1 \
+        man-openmpi/man1/mpijavac.1
+
+OSHMEM_MAN1_REDIRECTS = \
+        man-openshmem/man1/oshcc.1 \
+        man-openshmem/man1/oshcxx.1 \
+        man-openshmem/man1/oshc++.1 \
+        man-openshmem/man1/oshfort.1 \
+        man-openshmem/man1/shmemcc.1 \
+        man-openshmem/man1/shmemcxx.1 \
+        man-openshmem/man1/shmemc++.1 \
+        man-openshmem/man1/shmemfort.1
+
+EXTRA_DIST += \
+        $(OMPI_MAN1_REDIRECTS) \
+        $(OSHMEM_MAN1_REDIRECTS)
+
 ###########################################################################
 if OPAL_BUILD_DOCS
 
@@ -840,32 +874,19 @@ endif OPAL_BUILD_DOCS
 ###########################################################################
 if OPAL_INSTALL_DOCS
 
-dist_man1_MANS = \
+man1_MANS = \
         $(OMPI_MAN1_BUILT) \
-        man-openmpi/man1/mpicc.1 \
-        man-openmpi/man1/mpicxx.1 \
-        man-openmpi/man1/mpic++.1 \
-        man-openmpi/man1/mpifort.1 \
-        man-openmpi/man1/mpif77.1 \
-        man-openmpi/man1/mpif90.1 \
-        man-openmpi/man1/mpijavac.1
+        $(OMPI_MAN1_REDIRECTS)
 
-dist_man3_MANS = $(OMPI_MAN3_BUILT)
-dist_man5_MANS = $(OMPI_MAN5_BUILT)
+man3_MANS = $(OMPI_MAN3_BUILT)
+man5_MANS = $(OMPI_MAN5_BUILT)
 
 if PROJECT_OSHMEM
-dist_man1_MANS += \
+man1_MANS += \
         $(OSHMEM_MAN1_BUILT) \
-        man-openshmem/man1/oshcc.1 \
-        man-openshmem/man1/oshcxx.1 \
-        man-openshmem/man1/oshc++.1 \
-        man-openshmem/man1/oshfort.1 \
-        man-openshmem/man1/shmemcc.1 \
-        man-openshmem/man1/shmemcxx.1 \
-        man-openshmem/man1/shmemc++.1 \
-        man-openshmem/man1/shmemfort.1
+        $(OSHMEM_MAN1_REDIRECTS)
 
-dist_man3_MANS += $(OSHMEM_MAN3_BUILT)
+man3_MANS += $(OSHMEM_MAN3_BUILT)
 endif
 
 endif OPAL_INSTALL_DOCS