texk/web2c/otps: always distribute manpages

git-svn-id: svn://tug.org/texlive/trunk@36668 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 17 insertions, 11 deletions

diff --git a/Build/source/texk/web2c/otps/ChangeLog b/Build/source/texk/web2c/otps/ChangeLog
index a91a459943c..d37492178e4 100644
--- a/Build/source/texk/web2c/otps/ChangeLog
+++ b/Build/source/texk/web2c/otps/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Unconditionally distribute manpages.
+
 2013-06-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* otp-lexer.l: First #include <w2c/config.h> via "routines.h".
diff --git a/Build/source/texk/web2c/otps/Makefile.am b/Build/source/texk/web2c/otps/Makefile.am
index 194e942dd36..9a214a5efe0 100644
--- a/Build/source/texk/web2c/otps/Makefile.am
+++ b/Build/source/texk/web2c/otps/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/web2c/otps/
 ##
-## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2015 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir) $(KPATHSEA_INCLUDES)
@@ -28,11 +28,12 @@ SUBDIRS = win32
 else !WIN32
 bin_SCRIPTS = $(otps_scripts)
 endif !WIN32
-dist_man1_MANS = $(otps_programs:=.man) $(otps_scripts:=.man)
+man1_MANS = $(otps_mans)
 endif OTANGLE
 EXTRA_PROGRAMS = $(otps_programs)
+otps_mans = $(otps_programs:=.man) $(otps_scripts:=.man)
 
-EXTRA_DIST = $(otps_scripts)
+EXTRA_DIST = $(otps_scripts) $(otps_mans)
 
 otp2ocp_SOURCES = \
 	otp-parser.y \
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 3361a7cfd28..3a9b9c3223f 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -258,7 +258,7 @@ am__can_run_installinfo = \
   esac
 man1dir = $(mandir)/man1
 NROFF = nroff
-MANS = $(dist_man1_MANS)
+MANS = $(man1_MANS)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -462,7 +462,7 @@ am__set_b = \
       b='$*';; \
   esac
 DIST_SUBDIRS = win32
-am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in \
+am__DIST_COMMON = $(srcdir)/Makefile.in \
 	$(top_srcdir)/../../build-aux/depcomp \
 	$(top_srcdir)/../../build-aux/test-driver \
 	$(top_srcdir)/../../build-aux/ylwrap ChangeLog otp-lexer.c \
@@ -723,9 +723,10 @@ otps_scripts = mkocp mkofm
 noinst_HEADERS = otp.h routines.h yystype.h
 @OTANGLE_TRUE@@WIN32_TRUE@SUBDIRS = win32
 @OTANGLE_TRUE@@WIN32_FALSE@bin_SCRIPTS = $(otps_scripts)
-@OTANGLE_TRUE@dist_man1_MANS = $(otps_programs:=.man) $(otps_scripts:=.man)
-EXTRA_DIST = $(otps_scripts) otp2ocp.test outocp.test uni2lat.ocp \
-	uni2lat.otp uni2lat.out bugs.txt
+@OTANGLE_TRUE@man1_MANS = $(otps_mans)
+otps_mans = $(otps_programs:=.man) $(otps_scripts:=.man)
+EXTRA_DIST = $(otps_scripts) $(otps_mans) otp2ocp.test outocp.test \
+	uni2lat.ocp uni2lat.otp uni2lat.out bugs.txt
 otp2ocp_SOURCES = \
 	otp-parser.y \
 	otp-lexer.l \
@@ -917,9 +918,9 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(dist_man1_MANS)
+install-man1: $(man1_MANS)
 	@$(NORMAL_INSTALL)
-	@list1='$(dist_man1_MANS)'; \
+	@list1='$(man1_MANS)'; \
 	list2=''; \
 	test -n "$(man1dir)" \
 	  && test -n "`echo $$list1$$list2`" \
@@ -953,7 +954,7 @@ install-man1: $(dist_man1_MANS)
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \