From 37fad860b79d6ba5139abc06f2cb6afb7d64fbfa Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Fri, 20 Oct 2006 14:15:38 +0000
Subject: [PATCH] Grrr...  Forgot that EXTRA_DIST and man_MANS are not set to
 include all the possible things contained in the conditional like other rules
 are (for example, a SOURCES rule in a conditional automatically has its files
 added to the dist rules, even if that conditional isn't tru when make dist
 occurs).  So the man files weren't in the tarball.

Put the EXTRA_DIST with the files explicitly listed outside any conditionals
so the man pages always end up in the tarball.

This commit was SVN r12220.
---
 ompi/tools/wrappers/Makefile.am |  9 +++++++--
 opal/tools/wrappers/Makefile.am | 11 +++++------
 orte/tools/wrappers/Makefile.am |  6 ++++--
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ompi/tools/wrappers/Makefile.am b/ompi/tools/wrappers/Makefile.am
index 4d37267d98..75c027cf3c 100644
--- a/ompi/tools/wrappers/Makefile.am
+++ b/ompi/tools/wrappers/Makefile.am
@@ -17,6 +17,13 @@
 # $HEADER$
 #
 
+EXTRA_DIST = \
+	mpicc.1 \
+	mpic++.1 \
+	mpicxx.1 \
+	mpif77.1 \
+	mpif90.1
+
 dist_pkgdata_DATA = mpicc-wrapper-data.txt \
 	mpic++-wrapper-data.txt \
 	mpif77-wrapper-data.txt \
@@ -31,8 +38,6 @@ man_MANS = \
 	mpif77.1 \
 	mpif90.1
 
-EXTRA_DIST = $(man_MANS)
-
 install-exec-hook-always:
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	(cd $(DESTDIR)$(bindir); rm -f mpicc$(EXEEXT); $(LN_S) opal_wrapper mpicc)
diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am
index 0c274dfe50..c1f9195049 100644
--- a/opal/tools/wrappers/Makefile.am
+++ b/opal/tools/wrappers/Makefile.am
@@ -19,6 +19,11 @@
 
 DEFS="-DEXEEXT=\"$(EXEEXT)\""
 
+EXTRA_DIST = \
+	opal_wrapper.1 \
+	opalcc.1 \
+	opalc++.1
+
 if OMPI_INSTALL_BINARIES
 
 # install even if we don't want the headers / opalcc, as we need it
@@ -54,10 +59,6 @@ man_MANS = \
 	opalcc.1 \
 	opalc++.1
 
-EXTRA_DIST = \
-	opal_wrapper.1 \
-	$(man_MANS)
-
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); rm -f opalcc$(EXEEXT); $(LN_S) opal_wrapper opalcc)
 	(cd $(DESTDIR)$(bindir); rm -f opalc++$(EXEEXT); $(LN_S) opal_wrapper opalc++)
@@ -73,8 +74,6 @@ endif # WANT_INSTALL_HEADERS
 maintainer-clean-local:
 	rm -f opalcc.1 opalc++.1
 
-opal_wrapper.1:
-
 opalcc.1: opal_wrapper.1
 	rm -f opalcc.1
 	sed -e 's/@COMMAND@/opalcc/g' -e 's/@PROJECT@/Open PAL/g' -e 's/@PROJECT_SHORT@/OPAL/g' -e 's/@LANGUAGE@/C/g' < $(top_srcdir)/opal/tools/wrappers/opal_wrapper.1 > opalcc.1
diff --git a/orte/tools/wrappers/Makefile.am b/orte/tools/wrappers/Makefile.am
index 6dc787e5d4..5c1332f70f 100644
--- a/orte/tools/wrappers/Makefile.am
+++ b/orte/tools/wrappers/Makefile.am
@@ -17,6 +17,10 @@
 # $HEADER$
 #
 
+EXTRA_DIST = \
+	ortecc.1 \
+	ortec++.1
+
 if WANT_INSTALL_HEADERS
 
 nodist_pkgdata_DATA = \
@@ -29,8 +33,6 @@ man_MANS = \
 	ortecc.1 \
 	ortec++.1
 
-EXTRA_DIST = $(man_MANS)
-
 install-exec-hook:
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	(cd $(DESTDIR)$(bindir); rm -f ortecc$(EXEEXT); $(LN_S) opal_wrapper ortecc)