build system: check consistency of .texi files

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

4 files changed, 52 insertions, 6 deletions

diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 2a31f5ab086..7059ee234a7 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-16  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* doc/Makefile.am: Check that the doc/*.texi files are copies
+	of those in the distributed tree (maintainer mode only).
+
 2010-12-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 1.14 from savannah.nongnu.org.
diff --git a/Build/source/texk/dvipng/doc/Makefile.am b/Build/source/texk/dvipng/doc/Makefile.am
index e8d336c2e73..0dd468b48e5 100644
--- a/Build/source/texk/dvipng/doc/Makefile.am
+++ b/Build/source/texk/dvipng/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory texk/dvipng/doc/
 ##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 #
 info_TEXINFOS = \
@@ -11,6 +11,24 @@ dvipng_TEXINFOS = \
 	macros.texi \
 	dvipng.help
 
+BUILT_SOURCES = doc-stamp
+
+doc-stamp:
+if MAINTAINER_MODE
+## Check that the .texi files here are copies of those in ../$(DVIPNG_TREE)/.
+	@for f in dvipng install macros readme; do \
+	  f1="$(top_srcdir)/$(DVIPNG_TREE)/$$f.texi"; \
+	  f2="$(srcdir)/$$f.texi"; \
+	  echo "diff '$$f1' '$$f2'"; \
+	  if diff "$$f1" "$$f2"; then :; \
+	  else \
+	    echo "cp -p '$$f1' '$$f2'"; \
+	    cp -p "$$f1" "$$f2"; \
+	  fi; \
+	done
+endif MAINTAINER_MODE
+	echo timestamp >$@
+
 dist_noinst_SCRIPTS = texi2pod.pl
 
 dist_man1_MANS = dvipng.1
@@ -30,3 +48,5 @@ uninstall-hook:
 	rm -f $(DESTDIR)$(man1dir)/dvigif.1
 endif have_gif
 
+DISTCLEANFILES = doc-stamp
+
diff --git a/Build/source/texk/dvipng/doc/Makefile.in b/Build/source/texk/dvipng/doc/Makefile.in
index 930b2c47427..1594ba9498b 100644
--- a/Build/source/texk/dvipng/doc/Makefile.in
+++ b/Build/source/texk/dvipng/doc/Makefile.in
@@ -254,9 +254,12 @@ dvipng_TEXINFOS = \
 	macros.texi \
 	dvipng.help
 
+BUILT_SOURCES = doc-stamp
 dist_noinst_SCRIPTS = texi2pod.pl
 dist_man1_MANS = dvipng.1
-all: all-am
+DISTCLEANFILES = doc-stamp
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .dvi .html .info .pdf .ps .texi
@@ -531,13 +534,15 @@ distdir: $(DISTFILES)
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-info
 check-am: all-am
-check: check-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
 all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-install: install-am
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -558,10 +563,12 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 @have_gif_FALSE@install-data-hook:
 @have_gif_FALSE@uninstall-hook:
 clean: clean-am
@@ -713,7 +720,8 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1
 
-.MAKE: install-am install-data-am install-strip uninstall-am
+.MAKE: all check install install-am install-data-am install-strip \
+	uninstall-am
 
 .PHONY: all all-am check check-am clean clean-aminfo clean-generic \
 	clean-libtool dist-info distclean distclean-generic \
@@ -730,6 +738,19 @@ uninstall-man: uninstall-man1
 	uninstall-hook uninstall-html-am uninstall-info-am \
 	uninstall-man uninstall-man1 uninstall-pdf-am uninstall-ps-am
 
+
+doc-stamp:
+@MAINTAINER_MODE_TRUE@	@for f in dvipng install macros readme; do \
+@MAINTAINER_MODE_TRUE@	  f1="$(top_srcdir)/$(DVIPNG_TREE)/$$f.texi"; \
+@MAINTAINER_MODE_TRUE@	  f2="$(srcdir)/$$f.texi"; \
+@MAINTAINER_MODE_TRUE@	  echo "diff '$$f1' '$$f2'"; \
+@MAINTAINER_MODE_TRUE@	  if diff "$$f1" "$$f2"; then :; \
+@MAINTAINER_MODE_TRUE@	  else \
+@MAINTAINER_MODE_TRUE@	    echo "cp -p '$$f1' '$$f2'"; \
+@MAINTAINER_MODE_TRUE@	    cp -p "$$f1" "$$f2"; \
+@MAINTAINER_MODE_TRUE@	  fi; \
+@MAINTAINER_MODE_TRUE@	done
+	echo timestamp >$@
 dvipng.1: dvipng.texi readme.texi
 	$(srcdir)/texi2pod.pl -D man $(srcdir)/dvipng.texi | \
 	sed -es/@//g -es/previewlatex/preview-latex/g -es/{}//g > dvipng.pod
diff --git a/Build/source/texk/dvipng/m4/gs-device.m4 b/Build/source/texk/dvipng/m4/gs-device.m4
index dcd0dea1f8b..77d34808f7e 100644
--- a/Build/source/texk/dvipng/m4/gs-device.m4
+++ b/Build/source/texk/dvipng/m4/gs-device.m4
@@ -3,7 +3,7 @@
 ## Some affiliation
 ##
 ## Notice:
-## I extracted these macros from aclocal.m4 in the dvipng-1,12 distribution
+## I extracted these macros from aclocal.m4 in the dvipng-1.12 distribution
 ## and renamed one in order not to violate the Autoconf (AC_) namespace.
 ## 26 Mar 2008, Peter Breitenlohner <tex-live@tug.org>
 ##