From b356fa22c9ecdf854ba07f9425588be80c6d3d84 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 26 Sep 2006 13:26:50 +0000 Subject: [PATCH] Fix "make dist" problems from last night. Had a disparity between opal and orte/ompi man pages -- no need to make local copies of the man page int he opal tree; just [un]install sym links in the mandir, like orte/ompi. This commit was SVN r11820. --- opal/tools/wrappers/Makefile.am | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/opal/tools/wrappers/Makefile.am b/opal/tools/wrappers/Makefile.am index 1f1ff80d03..a55d1fe91f 100644 --- a/opal/tools/wrappers/Makefile.am +++ b/opal/tools/wrappers/Makefile.am @@ -42,46 +42,38 @@ bin_PROGRAMS = opal_wrapper # List all man pages that will be installed -man_MANS = opalcc.1 opalc++.1 -if CASE_SENSITIVE_FS -man_MANS += opalCC.1 -endif +man_MANS = opalcc.1 -# Only include in the distribution tarball the man pages that are not -# generated (i.e., opalcc.1). +# MANS are not automatically distributed -EXTRA_DIST = opalcc.1 - -# Rules to generate the other man pages - -opalc++.1: $(srcdir)/opalcc.1 - cp -f $(srcdir)/opalcc.1 opalc++.1 -if CASE_SENSITIVE_FS -opalCC.1: $(srcdir)/opalcc.1 - cp -f $(srcdir)/opalcc.1 opalCC.1 -endif +EXTRA_DIST = $(man_MANS) if CASE_SENSITIVE_FS install-exec-hook: (cd $(DESTDIR)$(bindir); rm -f opalc++$(EXEEXT); $(LN_S) opal_wrapper opalc++) (cd $(DESTDIR)$(bindir); rm -f opalCC$(EXEEXT); $(LN_S) opal_wrapper opalCC) - + (cd $(DESTDIR)$(mandir)/man1; rm -f opalc++.1; $(LN_S) opalcc.1 opalc++.1) + (cd $(DESTDIR)$(mandir)/man1; rm -f opalCC.1; $(LN_S) opalcc.1 opalCC.1) (cd $(DESTDIR)$(pkgdatadir); rm -f opalCC-wrapper-data.txt; $(LN_S) opalc++-wrapper-data.txt opalCC-wrapper-data.txt) uninstall-local: rm -f $(DESTDIR)$(bindir)/opalcc$(EXEEXT) \ $(DESTDIR)$(bindir)/opalc++$(EXEEXT) \ $(DESTDIR)$(bindir)/opalCC$(EXEEXT) \ + $(DESTDIR)$(mandir)/man1/opalc++.1 \ + $(DESTDIR)$(mandir)/man1/opalCC.1 \ $(DESTDIR)$(pkgdatadir)/opalCC-wrapper-data.txt else 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++) + (cd $(DESTDIR)$(mandir)/man1; rm -f opalc++.1; $(LN_S) opalcc.1 opalc++.1) uninstall-local: rm -f $(DESTDIR)$(bindir)/opalcc$(EXEEXT) \ - $(DESTDIR)$(bindir)/opalc++$(EXEEXT) + $(DESTDIR)$(bindir)/opalc++$(EXEEXT) \ + $(DESTDIR)$(mandir)/man1/opalc++.1 endif