From a66ff52e1f751a382c6cfb3d1cdaeec299965dd1 Mon Sep 17 00:00:00 2001
From: John Ellson <ellson@research.att.com>
Date: Mon, 15 Aug 2016 14:12:35 -0400
Subject: [PATCH]  build manpages unconditionally on Travis hsost

---
 cmd/dotty/Makefile.am  | 12 +++++-------
 cmd/gvedit/Makefile.am |  5 +++--
 cmd/gvmap/Makefile.am  |  5 +++--
 cmd/lefty/Makefile.am  | 16 +++++-----------
 cmd/lneato/Makefile.am | 12 +++++-------
 cmd/mingle/Makefile.am |  2 +-
 cmd/smyrna/Makefile.am | 16 +++++-----------
 cmd/tools/Makefile.am  |  1 +
 8 files changed, 28 insertions(+), 41 deletions(-)

diff --git a/cmd/dotty/Makefile.am b/cmd/dotty/Makefile.am
index 4e40d0abe..ae2d7e1ce 100644
--- a/cmd/dotty/Makefile.am
+++ b/cmd/dotty/Makefile.am
@@ -1,15 +1,10 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
-man = dotty.1
-pdf = dotty.1.pdf
-
 leftydir = $(pkgdatadir)/lefty
 pdfdir = $(pkgdatadir)/doc/pdf
 
 if WITH_X
-man_MANS = $(man)
-pdf_DATA = $(pdf)
 if WITH_WIN32
 bin_PROGRAMS = dotty
 else
@@ -19,6 +14,9 @@ lefty_DATA = dotty.lefty dotty_draw.lefty dotty_edit.lefty \
         dotty_layout.lefty dotty_ui.lefty
 endif
 
+man_MANS = dotty.1
+pdf_DATA = dotty.1.pdf
+
 if WITH_WIN32
 dotty_SOURCES = mswin32/dotty.c
 dotty_LDADD = -luser32 -lgdi32 -lwinspool -lcomdlg32 -ladvapi32 -lshell32
@@ -31,8 +29,8 @@ endif
 dotty.1.pdf: $(srcdir)/dotty.1
 	- @GROFF@ -Tps -man $(srcdir)/dotty.1 | @PS2PDF@ - - >dotty.1.pdf
 
-EXTRA_DIST = $(lefty_DATA) $(man) $(pdf) \
+EXTRA_DIST = $(lefty_DATA) $(man_MANS) $(pdf_DATA) \
 	dotty.bsh dotty.ksh dotty.sh \
 	notes mswin32 dotty.vcxproj*
 
-DISTCLEANFILES = $(pdf) dotty
+DISTCLEANFILES = $(pdf_DATA) dotty
diff --git a/cmd/gvedit/Makefile.am b/cmd/gvedit/Makefile.am
index 6e4af05b7..dfb12c301 100644
--- a/cmd/gvedit/Makefile.am
+++ b/cmd/gvedit/Makefile.am
@@ -7,12 +7,13 @@ pdfdir = $(pkgdatadir)/doc/pdf
 gveditdir = $(pkgdatadir)/gvedit
 
 if WITH_QT
-man_MANS = gvedit.1
-pdf_DATA = gvedit.1.pdf
 bin_PROGRAMS = gvedit
 gvedit_DATA = attrs.txt
 endif
 
+man_MANS = gvedit.1
+pdf_DATA = gvedit.1.pdf
+
 AM_CPPFLAGS = \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/lib/gvc \
diff --git a/cmd/gvmap/Makefile.am b/cmd/gvmap/Makefile.am
index 59d9639e0..3b1919f42 100644
--- a/cmd/gvmap/Makefile.am
+++ b/cmd/gvmap/Makefile.am
@@ -2,8 +2,6 @@
 ## Process this file with automake to produce Makefile.in
 
 pdfdir = $(pkgdatadir)/doc/pdf
-man_MANS = gvmap.1 cluster.1 gvmap.sh.1
-pdf_DATA = gvmap.1.pdf cluster.1.pdf gvmap.sh.1.pdf
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
@@ -21,6 +19,9 @@ bin_PROGRAMS = gvmap cluster
 dist_bin_SCRIPTS = gvmap.sh
 endif
 
+man_MANS = gvmap.1 cluster.1 gvmap.sh.1
+pdf_DATA = gvmap.1.pdf cluster.1.pdf gvmap.sh.1.pdf
+
 noinst_HEADERS = make_map.h power.h country_graph_coloring.h
 
 gvmap_SOURCES = gvmap.c make_map.c power.c country_graph_coloring.c
diff --git a/cmd/lefty/Makefile.am b/cmd/lefty/Makefile.am
index c8f3f21a9..3f42858d8 100644
--- a/cmd/lefty/Makefile.am
+++ b/cmd/lefty/Makefile.am
@@ -41,26 +41,21 @@ AM_CPPFLAGS = \
 AM_CFLAGS = -DLEFTYDATADIR=\"$(leftydir)\" -DHAVE_CONFIG_H @X_CFLAGS@
 endif
 
-
-man = lefty.1
-pdf = lefty.1.pdf
-
 noinst_HEADERS = code.h common.h display.h exec.h g.h gfxview.h internal.h \
 	leftyio.h lex.h mem.h parse.h str.h tbl.h txtview.h
 
 if WITH_X
 if WITH_XAW
 bin_PROGRAMS = lefty
-man_MANS = $(man)
-pdf_DATA = $(pdf)
 endif
 endif
 if WITH_WIN32
 bin_PROGRAMS = lefty
-man_MANS = $(man)
-pdf_DATA = $(pdf)
 endif
 
+man_MANS = lefty.1
+pdf_DATA = lefty.1.pdf
+
 lefty_DATA = lefty.psp
 
 lefty_SOURCES = code.c common.c display.c exec.c g.c gfxview.c internal.c \
@@ -96,7 +91,6 @@ endif
 lefty.1.pdf: $(srcdir)/lefty.1
 	- @GROFF@ -Tps -man $(srcdir)/lefty.1 | @PS2PDF@ - - >lefty.1.pdf
 
-EXTRA_DIST = $(lefty_DATA) $(man) $(pdf) \
-	lefty.vcxproj* colors.txt aix_mods cs2l/*
+EXTRA_DIST = $(lefty_DATA) $(man_MANS) $(pdf_DATA) lefty.vcxproj* colors.txt aix_mods cs2l/*
 
-DISTCLEANFILES = $(pdf)
+DISTCLEANFILES = $(pdf_DATA)
diff --git a/cmd/lneato/Makefile.am b/cmd/lneato/Makefile.am
index 5fad70d1a..0d8d10d5d 100644
--- a/cmd/lneato/Makefile.am
+++ b/cmd/lneato/Makefile.am
@@ -3,12 +3,7 @@
 
 pdfdir = $(pkgdatadir)/doc/pdf
 
-man = lneato.1
-pdf = lneato.1.pdf
-
 if WITH_X
-man_MANS = $(man)
-pdf_DATA = $(pdf)
 if WITH_WIN32
 bin_PROGRAMS = lneato
 else
@@ -16,6 +11,9 @@ bin_SCRIPTS = lneato
 endif
 endif
 
+man_MANS = lneato.1
+pdf_DATA = lneato.1.pdf
+
 AM_CFLAGS = -DLNEATO
 if WITH_WIN32
 lneato_SOURCES = ${top_srcdir}/cmd/dotty/mswin32/dotty.c
@@ -29,7 +27,7 @@ endif
 lneato.1.pdf: $(srcdir)/lneato.1
 	- @GROFF@ -Tps -man $(srcdir)/lneato.1 | @PS2PDF@ - - >lneato.1.pdf
 
-EXTRA_DIST = $(man) $(pdf) lneato.bsh lneato.ksh lneato.sh \
+EXTRA_DIST = $(man_MANS) $(pdf_DATA) lneato.bsh lneato.ksh lneato.sh \
 	mswin32 lneato.vcxproj*
 
-DISTCLEANFILES = lneato $(pdf)
+DISTCLEANFILES = lneato $(pdf_DATA)
diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index 8e0e7a95f..edf2ba3e7 100644
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -14,10 +14,10 @@ AM_CPPFLAGS = \
 
 if WITH_ANN
 bin_PROGRAMS = mingle
+endif
 
 man_MANS = mingle.1
 pdf_DATA = mingle.1.pdf
-endif
 
 mingle_SOURCES = minglemain.c
 mingle_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/cmd/smyrna/Makefile.am b/cmd/smyrna/Makefile.am
index e117c7fe7..6df6b718a 100644
--- a/cmd/smyrna/Makefile.am
+++ b/cmd/smyrna/Makefile.am
@@ -3,11 +3,6 @@
 
 pdfdir = $(pkgdatadir)/doc/pdf
 
-
-man = smyrna.1
-pdf = smyrna.1.pdf
-
-
 AM_CPPFLAGS = \
 	-DSMYRNA_PATH=\""$(pkgdatadir)/smyrna"\" \
         -I$(top_srcdir) \
@@ -26,12 +21,8 @@ AM_CPPFLAGS = \
         -I$(top_srcdir)/cmd/smyrna/gui \
 	$(GTK_CFLAGS) $(GLUT_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS)
 
-man_MANS =
-pdf_DATA =
 bin_PROGRAMS =
 if WITH_SMYRNA
-man_MANS += $(man)
-pdf_DATA += $(pdf)
 if ENABLE_SHARED
 bin_PROGRAMS += smyrna 
 endif
@@ -40,6 +31,9 @@ bin_PROGRAMS += smyrna_static
 endif
 endif
 
+man_MANS = smyrna.1
+pdf_DATA = smyrna.1.pdf
+
 noinst_HEADERS = arcball.h draw.h glexpose.h \
 	glmotion.h gltemplate.h gui/appmouse.h gui/callbacks.h \
 	hotkeymap.h materials.h md5.h polytess.h selectionfuncs.h \
@@ -88,7 +82,7 @@ smyrna_static_LDADD = $(top_builddir)/lib/cgraph/libcgraph_C.la \
 smyrna.1.pdf: $(srcdir)/smyrna.1
 	- @GROFF@ -Tps -man $(srcdir)/smyrna.1 | @PS2PDF@ - - >smyrna.1.pdf
 
-EXTRA_DIST = smyrna.vcxproj* $(man) $(pdf)
+EXTRA_DIST = smyrna.vcxproj* $(man_MANS) $(pdf_DATA)
 
-DISTCLEANFILES = $(pdf)
+DISTCLEANFILES = $(pdf_DATA)
 
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
index 616db6ec6..44fd9fc9d 100644
--- a/cmd/tools/Makefile.am
+++ b/cmd/tools/Makefile.am
@@ -25,6 +25,7 @@ else
 bin_PROGRAMS = gc gvcolor gxl2gv acyclic nop ccomps sccmap tred \
 	unflatten gvpack dijkstra bcomps mm2gv gvgen gml2gv gv2gml graphml2gv
 endif
+
 man_MANS = gc.1 gvcolor.1 gxl2gv.1 acyclic.1 nop.1 ccomps.1 sccmap.1 \
 	tred.1 unflatten.1 gvpack.1 dijkstra.1 bcomps.1 mm2gv.1 gvgen.1 gml2gv.1 graphml2gv.1
 pdf_DATA = gc.1.pdf gvcolor.1.pdf gxl2gv.1.pdf acyclic.1.pdf \
-- 
2.40.0